Skip to content

Commit 7db12d0

Browse files
MistakeNot4892MistakeNot4892
committed
Merge branch 'dev' of github.com:NebulaSS13/Nebula into fork/pyrelight
2 parents 743e394 + d8a5fa5 commit 7db12d0

File tree

8 files changed

+108
-99
lines changed

8 files changed

+108
-99
lines changed

‎maps/karzerfeste/karzerfeste-1-1.dmm‎

Lines changed: 57 additions & 57 deletions
Large diffs are not rendered by default.

‎maps/karzerfeste/karzerfeste-1-2.dmm‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
/turf/floor/path/running_bond/granite,
149149
/area/karzerfeste/outside/keep/above/indoors/west)
150150
"gB" = (
151-
/obj/structure/bed/chair/wood/ebony{
151+
/obj/structure/chair/wood/ebony{
152152
dir = 4
153153
},
154154
/turf/floor/path/running_bond/granite,
@@ -264,7 +264,7 @@
264264
/obj/structure/railing/mapped/wooden/ebony{
265265
dir = 1
266266
},
267-
/obj/structure/bed/chair/wood/ebony{
267+
/obj/structure/chair/wood/ebony{
268268
dir = 4
269269
},
270270
/turf/floor/path/running_bond/granite,
@@ -298,7 +298,7 @@
298298
/obj/structure/railing/mapped/wooden/ebony{
299299
dir = 1
300300
},
301-
/obj/structure/bed/chair/wood/ebony,
301+
/obj/structure/chair/wood/ebony,
302302
/obj/structure/railing/mapped/wooden/ebony{
303303
dir = 8
304304
},
@@ -325,7 +325,7 @@
325325
dir = 4
326326
},
327327
/obj/structure/railing/mapped/wooden/ebony,
328-
/obj/structure/bed/chair/wood/ebony{
328+
/obj/structure/chair/wood/ebony{
329329
dir = 1
330330
},
331331
/turf/floor/wood/maple,
@@ -416,7 +416,7 @@
416416
/turf/unsimulated/mask,
417417
/area/karzerfeste/caves/upper_east)
418418
"uo" = (
419-
/obj/structure/bed/chair/wood/ebony{
419+
/obj/structure/chair/wood/ebony{
420420
dir = 4
421421
},
422422
/turf/floor/path/running_bond/granite,
@@ -676,7 +676,7 @@
676676
/turf/open,
677677
/area/karzerfeste/outside/ward/wall)
678678
"FZ" = (
679-
/obj/structure/bed/chair/wood/ebony{
679+
/obj/structure/chair/wood/ebony{
680680
dir = 4
681681
},
682682
/turf/floor/path/running_bond/granite,
@@ -694,7 +694,7 @@
694694
/turf/open,
695695
/area/karzerfeste/outside/keep/tower/four)
696696
"GX" = (
697-
/obj/structure/bed/chair/wood/ebony{
697+
/obj/structure/chair/wood/ebony{
698698
dir = 1
699699
},
700700
/turf/floor/path/running_bond/granite,
@@ -745,7 +745,7 @@
745745
/area/karzerfeste/outside/road)
746746
"IY" = (
747747
/obj/structure/railing/mapped/wooden/ebony,
748-
/obj/structure/bed/chair/wood/ebony,
748+
/obj/structure/chair/wood/ebony,
749749
/turf/floor/wood/maple,
750750
/area/karzerfeste/outside/ward)
751751
"IZ" = (
@@ -764,7 +764,7 @@
764764
/turf/floor/path/running_bond/granite,
765765
/area/karzerfeste/outside/keep/gatehouse)
766766
"KA" = (
767-
/obj/structure/bed/chair/wood/ebony,
767+
/obj/structure/chair/wood/ebony,
768768
/turf/floor/path/running_bond/granite,
769769
/area/karzerfeste/outside/keep/above/indoors/west)
770770
"Lc" = (
@@ -779,7 +779,7 @@
779779
/turf/floor/path/running_bond/granite,
780780
/area/karzerfeste/outside/keep/tower/four)
781781
"LL" = (
782-
/obj/structure/bed/chair/wood/ebony{
782+
/obj/structure/chair/wood/ebony{
783783
dir = 8
784784
},
785785
/obj/effect/floor_decal/spline/fancy/wood/walnut{
@@ -823,7 +823,7 @@
823823
/turf/floor/path/running_bond/granite,
824824
/area/karzerfeste/outside/keep/tower/three)
825825
"Ns" = (
826-
/obj/structure/bed/chair/wood/ebony{
826+
/obj/structure/chair/wood/ebony{
827827
dir = 8
828828
},
829829
/turf/floor/path/running_bond/granite,
@@ -844,7 +844,7 @@
844844
/turf/floor/path/running_bond/granite,
845845
/area/karzerfeste/outside/keep/tower/four)
846846
"NS" = (
847-
/obj/structure/bed/chair/wood/ebony{
847+
/obj/structure/chair/wood/ebony{
848848
dir = 8
849849
},
850850
/turf/floor/path/running_bond/granite,
@@ -863,7 +863,7 @@
863863
/area/karzerfeste/outside/keep/tower/three)
864864
"PH" = (
865865
/obj/structure/railing/mapped/wooden/ebony,
866-
/obj/structure/bed/chair/wood/ebony{
866+
/obj/structure/chair/wood/ebony{
867867
dir = 1
868868
},
869869
/obj/structure/railing/mapped/wooden/ebony{
@@ -911,7 +911,7 @@
911911
/turf/floor/path/running_bond/granite,
912912
/area/karzerfeste/outside/keep/above/indoors)
913913
"Si" = (
914-
/obj/structure/bed/chair/wood/ebony{
914+
/obj/structure/chair/wood/ebony{
915915
dir = 8
916916
},
917917
/turf/floor/wood/maple,
@@ -986,7 +986,7 @@
986986
/turf/floor/path/running_bond/granite,
987987
/area/karzerfeste/outside/keep/above/indoors/southwest)
988988
"VC" = (
989-
/obj/structure/bed/chair/wood/ebony{
989+
/obj/structure/chair/wood/ebony{
990990
dir = 1
991991
},
992992
/turf/floor/wood/maple,
@@ -1005,7 +1005,7 @@
10051005
/obj/structure/railing/mapped/wooden/ebony{
10061006
dir = 1
10071007
},
1008-
/obj/structure/bed/chair/wood/ebony,
1008+
/obj/structure/chair/wood/ebony,
10091009
/turf/floor/wood/maple,
10101010
/area/karzerfeste/outside/keep/above/indoors/west)
10111011
"VS" = (
@@ -1042,7 +1042,7 @@
10421042
/obj/structure/railing/mapped/wooden/ebony{
10431043
dir = 1
10441044
},
1045-
/obj/structure/bed/chair/wood/ebony{
1045+
/obj/structure/chair/wood/ebony{
10461046
dir = 8
10471047
},
10481048
/turf/floor/path/running_bond/granite,
@@ -1080,7 +1080,7 @@
10801080
/turf/floor/path/running_bond/granite,
10811081
/area/karzerfeste/outside/keep/tower/three)
10821082
"ZI" = (
1083-
/obj/structure/bed/chair/wood/ebony,
1083+
/obj/structure/chair/wood/ebony,
10841084
/turf/floor/path/running_bond/granite,
10851085
/area/karzerfeste/outside/keep/above/indoors/east)
10861086
"ZJ" = (

‎maps/karzerfeste/submaps/dungeon_barracks.dmm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
22
"a" = (
3-
/obj/structure/bed/chair/bench/ebony{
3+
/obj/structure/chair/bench/ebony{
44
dir = 8
55
},
66
/turf/floor/path/herringbone/basalt,
@@ -78,7 +78,7 @@
7878
/turf/floor/path/herringbone/basalt,
7979
/area/karzerfeste/caves/point_of_interest/dungeon)
8080
"A" = (
81-
/obj/structure/bed/chair/bench/ebony{
81+
/obj/structure/chair/bench/ebony{
8282
dir = 8
8383
},
8484
/obj/item/stack/medical/bandage/crafted/five,
@@ -94,7 +94,7 @@
9494
/turf/floor/path/running_bond/basalt,
9595
/area/karzerfeste/caves/point_of_interest/dungeon)
9696
"I" = (
97-
/obj/structure/bed/chair/bench/ebony{
97+
/obj/structure/chair/bench/ebony{
9898
dir = 4
9999
},
100100
/obj/item/stack/material/bolt/mapped/cloth/five,
@@ -122,7 +122,7 @@
122122
/turf/floor/path/running_bond/basalt,
123123
/area/karzerfeste/caves/point_of_interest/dungeon)
124124
"O" = (
125-
/obj/structure/bed/chair/bench/ebony{
125+
/obj/structure/chair/bench/ebony{
126126
dir = 8
127127
},
128128
/obj/item/food/grown/dried_tobacco/bad,
@@ -140,27 +140,27 @@
140140
/turf/floor/path/running_bond/basalt,
141141
/area/karzerfeste/caves/point_of_interest/dungeon)
142142
"R" = (
143-
/obj/structure/bed/chair/bench/ebony{
143+
/obj/structure/chair/bench/ebony{
144144
dir = 8
145145
},
146146
/obj/item/bladed/folding,
147147
/turf/floor/path/herringbone/basalt,
148148
/area/karzerfeste/caves/point_of_interest/dungeon)
149149
"U" = (
150-
/obj/structure/bed/chair/bench/ebony{
150+
/obj/structure/chair/bench/ebony{
151151
dir = 4
152152
},
153153
/obj/item/food/grown/dried_tobacco/bad,
154154
/turf/floor/path/herringbone/basalt,
155155
/area/karzerfeste/caves/point_of_interest/dungeon)
156156
"X" = (
157-
/obj/structure/bed/chair/bench/ebony{
157+
/obj/structure/chair/bench/ebony{
158158
dir = 4
159159
},
160160
/turf/floor/path/herringbone/basalt,
161161
/area/karzerfeste/caves/point_of_interest/dungeon)
162162
"Z" = (
163-
/obj/structure/bed/chair/bench/ebony{
163+
/obj/structure/chair/bench/ebony{
164164
dir = 4
165165
},
166166
/obj/item/stack/medical/bandage/crafted/five,

‎maps/karzerfeste/submaps/dungeon_feasting_hall.dmm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
/turf/floor/path/herringbone/basalt,
3030
/area/karzerfeste/caves/point_of_interest/dungeon)
3131
"n" = (
32-
/obj/structure/bed/chair/bench/ebony{
32+
/obj/structure/chair/bench/ebony{
3333
dir = 8
3434
},
3535
/turf/floor/path/running_bond/basalt,
3636
/area/karzerfeste/caves/point_of_interest/dungeon)
3737
"p" = (
38-
/obj/structure/bed/chair/bench/ebony{
38+
/obj/structure/chair/bench/ebony{
3939
dir = 8
4040
},
4141
/obj/random/hostile/dungeon,
@@ -66,22 +66,22 @@
6666
/turf/floor/path/running_bond/basalt,
6767
/area/karzerfeste/caves/point_of_interest/dungeon)
6868
"E" = (
69-
/obj/structure/bed/chair/bench/ebony{
69+
/obj/structure/chair/bench/ebony{
7070
dir = 8
7171
},
7272
/obj/item/remains/human,
7373
/obj/item/clothing/suit/armor/forged/banded,
7474
/turf/floor/path/running_bond/basalt,
7575
/area/karzerfeste/caves/point_of_interest/dungeon)
7676
"G" = (
77-
/obj/structure/bed/chair/bench/ebony{
77+
/obj/structure/chair/bench/ebony{
7878
dir = 8
7979
},
8080
/obj/item/stack/material/bolt/mapped/cloth/five,
8181
/turf/floor/path/running_bond/basalt,
8282
/area/karzerfeste/caves/point_of_interest/dungeon)
8383
"J" = (
84-
/obj/structure/bed/chair/bench/ebony{
84+
/obj/structure/chair/bench/ebony{
8585
dir = 4
8686
},
8787
/obj/item/remains/human,
@@ -102,7 +102,7 @@
102102
/turf/floor/path/running_bond/basalt,
103103
/area/karzerfeste/caves/point_of_interest/dungeon)
104104
"S" = (
105-
/obj/structure/bed/chair/bench/ebony{
105+
/obj/structure/chair/bench/ebony{
106106
dir = 4
107107
},
108108
/obj/random/hostile/dungeon,
@@ -117,7 +117,7 @@
117117
/turf/floor/path/running_bond/basalt,
118118
/area/karzerfeste/caves/point_of_interest/dungeon)
119119
"Z" = (
120-
/obj/structure/bed/chair/bench/ebony{
120+
/obj/structure/chair/bench/ebony{
121121
dir = 4
122122
},
123123
/turf/floor/path/running_bond/basalt,

‎maps/karzerfeste/submaps/dungeon_smithy.dmm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/turf/floor/path/running_bond/basalt,
2424
/area/karzerfeste/caves/point_of_interest/dungeon)
2525
"k" = (
26-
/obj/structure/bed/chair/bench/ebony{
26+
/obj/structure/chair/bench/ebony{
2727
dir = 8
2828
},
2929
/turf/floor/path/running_bond/basalt,
@@ -87,7 +87,7 @@
8787
/turf/floor/path/herringbone/basalt,
8888
/area/karzerfeste/caves/point_of_interest/dungeon)
8989
"X" = (
90-
/obj/structure/bed/chair/bench/ebony{
90+
/obj/structure/chair/bench/ebony{
9191
dir = 4
9292
},
9393
/turf/floor/path/running_bond/basalt,

‎maps/karzerfeste/submaps/dungeon_workshop.dmm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/turf/template_noop,
44
/area/karzerfeste/caves/point_of_interest/dungeon)
55
"c" = (
6-
/obj/structure/bed/chair/bench/ebony{
6+
/obj/structure/chair/bench/ebony{
77
dir = 8
88
},
99
/turf/floor/path/running_bond/basalt,
@@ -53,7 +53,7 @@
5353
/turf/floor/path/running_bond/basalt,
5454
/area/karzerfeste/caves/point_of_interest/dungeon)
5555
"K" = (
56-
/obj/structure/bed/chair/bench/ebony{
56+
/obj/structure/chair/bench/ebony{
5757
dir = 4
5858
},
5959
/turf/floor/path/running_bond/basalt,

‎mods/pyrelight/plants/plants_fruit.dm‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,17 @@
4141
for(var/i = 1 to remaining)
4242
add_overlay(image(icon, "[comp.icon_state][++comp_count[comp.name]]"))
4343

44-
/obj/item/food/fruit/examine(mob/user, distance)
44+
/obj/item/food/fruit/get_examine_strings(mob/user, distance, infix, suffix)
4545
. = ..()
4646
if(distance > 1)
4747
return
48-
4948
if(examine_info && (!examine_info_skill || !examine_info_rank || user.skill_check(examine_info_skill, examine_info_rank)))
50-
to_chat(user, examine_info)
49+
. += examine_info
5150

51+
/obj/item/food/fruit/get_examine_hints(mob/user, distance, infix, suffix)
52+
. = ..()
53+
if(distance > 1)
54+
return
5255
var/list/fruit_comp_strings = list()
5356
for(var/datum/fruit_segment/comp as anything in get_composition())
5457
var/remaining = comp.dissect_amount - LAZYACCESS(removed_segments, comp)
@@ -65,7 +68,7 @@
6568
for(var/comp_string in fruit_comp_strings[comp_ind])
6669
comp_string_comps += "[fruit_comp_strings[comp_ind][comp_string]] [comp_string]\s"
6770
if(length(comp_string_comps))
68-
to_chat(user, SPAN_NOTICE("With [comp_ind], you could harvest [english_list(comp_string_comps)]."))
71+
LAZYADD(., SPAN_NOTICE("With [comp_ind], you could harvest [english_list(comp_string_comps)]."))
6972

7073
/obj/item/food/fruit/attackby(obj/item/W, mob/living/user)
7174
if(!user?.check_intent(I_FLAG_HARM))

‎mods/pyrelight/undead/undead_zombie.dm‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@
1919

2020
for(var/obj/item/organ/organ in get_organs())
2121
organ.die()
22-
organ.damage = 0 // die() sets to max damage
2322
organ.germ_level = INFECTION_LEVEL_THREE
2423

24+
// die() sets to max damage
25+
for(var/obj/item/organ/internal/organ in get_internal_organs())
26+
organ.set_organ_damage(0)
27+
for(var/obj/item/organ/external/limb in get_internal_organs())
28+
limb.brute_dam = 0
29+
limb.burn_dam = 0
30+
2531
// Set this so nonhumans look appropriately gross.
2632
reset_hair()
2733
if(get_bodytype()?.appearance_flags & HAS_SKIN_COLOR)

0 commit comments

Comments
 (0)