Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged

:) #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
66a9722
Removes DEBUG from compile_options.
MrsTonedOne Mar 5, 2018
fd0e59b
Minor say code cleanup
optimumtact Mar 6, 2018
d39472e
Fixed new diseases getting their old name
Cruix Mar 6, 2018
78d4e57
lithnessk -> litheness
cebutris Mar 6, 2018
fe9793f
Automatic changelog compile, [ci skip]
tgstation-server Mar 6, 2018
083eefb
Adds Medical Sprays (#36081)
CameronWoof Mar 6, 2018
90bfb9f
Automatic changelog generation for PR #36081 [ci skip]
tgstation-server Mar 6, 2018
0e337c6
[s]Adds detection for spoofed 512 clients (#36169)
MrsTonedOne Mar 6, 2018
57fa3ea
Sentient diseases get 2 minutes to select their initial host before b…
Cruix Mar 7, 2018
276c7c8
Admins can now drag ghosts onto camera mobs like they can onto living…
Cruix Mar 7, 2018
9b1e42f
Fix DisplayTimeText runtimes (#36187)
SpaceManiac Mar 7, 2018
6074194
Automatic changelog generation for PR #36187 [ci skip]
tgstation-server Mar 7, 2018
b664f68
Merge pull request #36190 from MrStonedOne/patch-489
Cyberboss Mar 7, 2018
018a74e
Allow configuring ruin/empty space level count - #36191
SpaceManiac Mar 7, 2018
58db9eb
[Ready]Adds circuitry lab to Pubbystation (#36151)
81Denton Mar 7, 2018
8cadd96
Automatic changelog generation for PR #36151 [ci skip]
tgstation-server Mar 7, 2018
be66696
Thirteen Loko is actually dangerous (#36166)
MMMiracles Mar 7, 2018
8047b03
Automatic changelog generation for PR #36166 [ci skip]
tgstation-server Mar 7, 2018
f8c5feb
Beacons are no longer radios (#36070)
DaxDupont Mar 7, 2018
6273624
Automatic changelog generation for PR #36070 [ci skip]
tgstation-server Mar 7, 2018
3ca111f
Adds explicit check for numberless backpack contents in outfits.
AnturK Mar 7, 2018
034b0c8
Merge pull request #36202 from cebutris/lithenessk
vuonojenmustaturska Mar 7, 2018
8d131c7
Automatic changelog generation for PR #36202 [ci skip]
tgstation-server Mar 7, 2018
dd5b81c
Merge pull request #36198 from Cruix/disease_fixes
vuonojenmustaturska Mar 7, 2018
5140cff
[reviewpls] Adds moodlets to the game - [Please give suggestions for …
Mar 8, 2018
1fbfa38
Automatic changelog generation for PR #35475 [ci skip]
tgstation-server Mar 8, 2018
4020ad1
Automatic changelog compile, [ci skip]
tgstation-server Mar 8, 2018
28b1fb2
RND TECHWEBS: TECHFABS (#36055)
silicons Mar 8, 2018
84d4b3a
Mushroom people, revived! (#35858)
Mar 8, 2018
79b96dd
Fixes master
silicons Mar 8, 2018
0bc8550
Small moodie balance changes (#36242)
Mar 8, 2018
72a7f2e
Transmission sigils no longer spam set_light
silicons Mar 8, 2018
4a85877
Gives ash drakes a togglable small sprite (#35993)
Spess-Rando Mar 8, 2018
9d23d93
BUCKLE UP, KIDS: emagging the emergency shuttle increases the distanc…
MrDoomBringer Mar 8, 2018
5842241
Automatic changelog generation for PR #36050 [ci skip]
tgstation-server Mar 8, 2018
f1460f3
smoke machines --> techwebs
silicons Mar 7, 2018
b911f14
Automatic changelog generation for PR #36220 [ci skip]
tgstation-server Mar 8, 2018
82dec54
Fixes meters on the RPD (#36193)
DaxDupont Mar 8, 2018
44d6b5e
Automatic changelog generation for PR #36193 [ci skip]
tgstation-server Mar 8, 2018
39360b5
Removes a whole bunch of nuclear emergency memes (#36215)
vuonojenmustaturska Mar 8, 2018
85ddea7
Automatic changelog generation for PR #36215 [ci skip]
tgstation-server Mar 8, 2018
a95d268
Permission panel fixes (#36219)
Jordie0608 Mar 8, 2018
e7b51ba
Ghosts can now examine sentient diseases to see info (#36192)
Mar 8, 2018
c07abf4
Automatic changelog generation for PR #36192 [ci skip]
tgstation-server Mar 8, 2018
ff1fcd6
To go even further byond... the above lighting layer! (#36106)
Mar 8, 2018
4d89c65
Automatic changelog generation for PR #36106 [ci skip]
tgstation-server Mar 8, 2018
74c45fb
Merge pull request #36195 from optimumtact/sayonara
vuonojenmustaturska Mar 8, 2018
6625660
Makes the smoke machine deconstructable
vuonojenmustaturska Mar 8, 2018
8a0556d
Lol @optimumtact
Cyberboss Mar 8, 2018
c6646e4
Automatic changelog compile, [ci skip]
tgstation-server Mar 8, 2018
dced076
Merge pull request #36259 from tgstation/Cyberboss-patch-1
optimumtact Mar 8, 2018
4fe8407
Merge pull request #36217 from Cruix/disease_freemove
vuonojenmustaturska Mar 8, 2018
29c6ff2
Automatic changelog generation for PR #36217 [ci skip]
tgstation-server Mar 8, 2018
1f5b591
NTNet airlocks (#35947)
ACCount12 Mar 8, 2018
6622c37
Automatic changelog generation for PR #35947 [ci skip]
tgstation-server Mar 8, 2018
d7a0d0a
Automatic changelog compile, [ci skip]
tgstation-server Mar 8, 2018
55f5870
Merge pull request #36233 from AnturK/nulllove
optimumtact Mar 9, 2018
6a28f86
Automatic changelog compile, [ci skip]
tgstation-server Mar 9, 2018
41590b6
The ARM is now harder to obtain (#36051)
Robustin Mar 9, 2018
e64a332
Automatic changelog generation for PR #36051 [ci skip]
tgstation-server Mar 9, 2018
cffedcf
Display cases can now have a list where to randomly spawn items from …
DaxDupont Mar 9, 2018
6736ddb
Automatic changelog generation for PR #36058 [ci skip]
tgstation-server Mar 9, 2018
4f2d98b
Projectiles delete on invalid turf (#36073)
silicons Mar 9, 2018
a96625b
Fixes GLOB protected vars exploit
Cyberboss Mar 9, 2018
17aded9
Merge pull request #36287 from tgstation/Cyberboss-patch-4
vuonojenmustaturska Mar 9, 2018
650a5ee
You can no longer SDQL select certain datums
Cyberboss Mar 9, 2018
29fb350
Stop qdeling shit you're not supposed to
Cyberboss Mar 9, 2018
88a039e
I'm this close to deleting SDQL entirely
Cyberboss Mar 9, 2018
2407f81
Merge pull request #36290 from tgstation/Cyberboss-patch-5
vuonojenmustaturska Mar 9, 2018
e01c890
Merge pull request #36289 from tgstation/Cyberboss-patch-4
vuonojenmustaturska Mar 9, 2018
3bfb668
Merge pull request #36288 from Cyberboss/BansKevinzFinally
vuonojenmustaturska Mar 9, 2018
21d1a3e
Merge pull request #36252 from kevinz000/patch-463
vuonojenmustaturska Mar 9, 2018
427f325
Merge pull request #36258 from vuonojenmustaturska/bepis
Cyberboss Mar 9, 2018
6f4c4ba
Automatic changelog generation for PR #36258 [ci skip]
tgstation-server Mar 9, 2018
1a65add
Disable advanced navigation consoles of the white ship and the carava…
vuonojenmustaturska Mar 8, 2018
8661d86
whoops forgot this thing
vuonojenmustaturska Mar 8, 2018
2a00750
US english memes
vuonojenmustaturska Mar 8, 2018
6e246bf
Automatic changelog generation for PR #36254 [ci skip]
tgstation-server Mar 9, 2018
7bc84c5
Pillbottles can now be made (#36083)
Mark9013100 Mar 9, 2018
422ad7e
Automatic changelog generation for PR #36083 [ci skip]
tgstation-server Mar 9, 2018
e65e368
Automatic changelog compile, [ci skip]
tgstation-server Mar 9, 2018
ec6f62f
Tidy Processor Overload event code (#36277)
SpaceManiac Mar 10, 2018
2cd09cc
.len runtime fix (#36275)
silicons Mar 10, 2018
74b5462
Test merge candidate is removed on commit push (#36266)
Cyberboss Mar 10, 2018
bf88f7f
NAMEOFs some things (#36263)
Cyberboss Mar 10, 2018
f3611fe
harmful var for guns (#36265)
PKPenguin321 Mar 10, 2018
7f293d2
Fixes shuttles breaking when the turf the mobile dock is on is remove…
ninjanomnom Mar 10, 2018
dc2e750
Automatic changelog generation for PR #36261 [ci skip]
tgstation-server Mar 10, 2018
9518d41
Unmaps the smoke machine (#36260)
vuonojenmustaturska Mar 10, 2018
c88b0cd
Automatic changelog generation for PR #36260 [ci skip]
tgstation-server Mar 10, 2018
10b5d3a
Fixes scaling displays (#36253)
silicons Mar 10, 2018
b752a3b
Automatic changelog generation for PR #36253 [ci skip]
tgstation-server Mar 10, 2018
bfd724e
Fixes mirror var desync (#36251)
ShizCalev Mar 10, 2018
eb2f6c9
Slightly optimizes adjust_clockwork_power (#36250)
silicons Mar 10, 2018
f7195a4
Fixes incinerator vents (#36237)
ShizCalev Mar 10, 2018
1293873
Adjust Tesla RP maths (#36229)
Poojawa Mar 10, 2018
b7dd356
Fixes bodies responding to phobias (#36227)
Mar 10, 2018
e87866b
Automatic changelog generation for PR #36227 [ci skip]
tgstation-server Mar 10, 2018
32b6683
Turrets can be set to shoot people without loyalty implants (#36226)
Irafas Mar 10, 2018
583c960
Automatic changelog generation for PR #36226 [ci skip]
tgstation-server Mar 10, 2018
4b08977
Constructed turbines now properly connect_to_network() (#36222)
Mar 10, 2018
2e94126
Automatic changelog generation for PR #36222 [ci skip]
tgstation-server Mar 10, 2018
bf8fa9c
Adds welding goggles to engivend (#36280)
81Denton Mar 10, 2018
9893683
Automatic changelog generation for PR #36280 [ci skip]
tgstation-server Mar 10, 2018
193f768
You can now non-violently place people on tables (#36150)
XDTM Mar 10, 2018
893eca9
Automatic changelog generation for PR #36150 [ci skip]
tgstation-server Mar 10, 2018
f4e0f56
Replaces alien brain necropolis chest loot with new artifact [MERGE R…
Mar 10, 2018
c532ded
Automatic changelog generation for PR #36143 [ci skip]
tgstation-server Mar 10, 2018
67f9406
Delta: Adds wall safes to HoP/Cap offices (#36281)
81Denton Mar 10, 2018
ad2e771
Automatic changelog generation for PR #36281 [ci skip]
tgstation-server Mar 10, 2018
b3b67b5
Automatic changelog compile, [ci skip]
tgstation-server Mar 10, 2018
73b0503
Fixes slow circuit cloning breaking with some circuits, and makes it …
Mar 10, 2018
4ec533c
Automatic changelog generation for PR #36255 [ci skip]
tgstation-server Mar 10, 2018
3a071de
Fixes Delta atmos maint access (#36291)
ShizCalev Mar 10, 2018
9e81c92
Fix config loading exploit (#36286)
Cyberboss Mar 10, 2018
fbfe214
Holy water is trivial against Eminence once Daddy arrives (#36285)
ExcessiveUseOfCobblestone Mar 10, 2018
38ec54c
Automatic changelog generation for PR #36285 [ci skip]
tgstation-server Mar 10, 2018
9757c6d
Automatic changelog compile, [ci skip]
tgstation-server Mar 10, 2018
8174eaf
Improves the shuttle error to include jump links and destination (#36…
ninjanomnom Mar 10, 2018
7d1896b
Automatic changelog generation for PR #36305 [ci skip]
tgstation-server Mar 10, 2018
ca0e4b5
Automatic changelog compile, [ci skip]
tgstation-server Mar 11, 2018
dff7009
Hopefully fixes unnecessary nightshift announcements (#36173)
Buggy123 Mar 11, 2018
3b7121b
Custom dockers must be greater than 10 tiles from map edge (#36306)
ninjanomnom Mar 11, 2018
0cc6409
Automatic changelog generation for PR #36306 [ci skip]
tgstation-server Mar 11, 2018
2c033c0
Pacifists can no longer cause harm using mech equipment (#36293)
Irafas Mar 11, 2018
6f0ba15
Automatic changelog generation for PR #36293 [ci skip]
tgstation-server Mar 11, 2018
4a6e0c6
Adds the Aurora Caelus event, the deep-space equivalent of the northe…
Mar 11, 2018
bff969b
Automatic changelog generation for PR #35987 [ci skip]
tgstation-server Mar 11, 2018
2bb3d27
[READY] Readds borg transformations (#36015)
Poojawa Mar 11, 2018
ee7a564
Automatic changelog generation for PR #36015 [ci skip]
tgstation-server Mar 11, 2018
05b320e
Play Internet Sound sanity checks (#36080)
JJRcop Mar 11, 2018
4f7a382
Automatic changelog generation for PR #36080 [ci skip]
tgstation-server Mar 11, 2018
ee96f85
Automatic changelog compile, [ci skip]
tgstation-server Mar 11, 2018
f70d7f7
Adds descriptions to all cargo orders! (#36077)
MrDoomBringer Mar 11, 2018
3971c3a
Automatic changelog generation for PR #36077 [ci skip]
tgstation-server Mar 11, 2018
75935c7
Updates mining drone sprites. (#36308)
Onule Mar 11, 2018
cee9a94
Automatic changelog generation for PR #36308 [ci skip]
tgstation-server Mar 11, 2018
6d669dd
Automatic changelog compile, [ci skip]
tgstation-server Mar 11, 2018
fdc2cc9
Machines can now be anchored on /turf/open/indestructible (#36311)
Buggy123 Mar 11, 2018
21dc637
Automatic changelog generation for PR #36311 [ci skip]
tgstation-server Mar 11, 2018
2d32392
Automatic changelog compile, [ci skip]
tgstation-server Mar 11, 2018
ae894a8
Makes space cleaner more efficient, reduces spraybottle volume (#36228)
vuonojenmustaturska Mar 11, 2018
db7543e
Automatic changelog generation for PR #36228 [ci skip]
tgstation-server Mar 11, 2018
ae63ce7
Fixes delta incinerator
ShizCalev Mar 11, 2018
4b53a7e
Cult Fixes and Minor Balance Tweaks (#36092)
Robustin Mar 11, 2018
111cd31
Automatic changelog generation for PR #36092 [ci skip]
tgstation-server Mar 11, 2018
53508f3
fixes stopsounds
vuonojenmustaturska Mar 11, 2018
259838f
Merge pull request #36340 from vuonojenmustaturska/beelogreen
Cyberboss Mar 11, 2018
ddcf2dd
Automatic changelog generation for PR #36340 [ci skip]
tgstation-server Mar 11, 2018
7627396
Automatic changelog compile, [ci skip]
tgstation-server Mar 12, 2018
b5d6a2e
New RCD Sprites, ammo counters, and actual yellow flashing lights! (#…
Michiyamenotehifunana Mar 12, 2018
1b52f8d
Automatic changelog generation for PR #36283 [ci skip]
tgstation-server Mar 12, 2018
7ea8617
Update _production.dm (#36333)
silicons Mar 12, 2018
3e1ff37
Lets belts hold additional job-specific items (#36323)
81Denton Mar 12, 2018
6931e74
Automatic changelog generation for PR #36323 [ci skip]
tgstation-server Mar 12, 2018
125eb04
why doesn't nukeops actually check required_enemies (#36056)
checkraisefold Mar 12, 2018
635b21b
Automatic changelog generation for PR #36056 [ci skip]
tgstation-server Mar 12, 2018
6aabcac
Create ERT refactor (#36321)
vuonojenmustaturska Mar 12, 2018
37eb33a
Automatic changelog generation for PR #36321 [ci skip]
tgstation-server Mar 12, 2018
abcf736
Medical sprays can now be added to medical belts and smartfridges (#3…
Polyphynx Mar 12, 2018
8fb4ba4
Automatic changelog generation for PR #36313 [ci skip]
tgstation-server Mar 12, 2018
6298b41
Merge pull request #36337 from ShizCalev/delta-incinerator-fix
Cyberboss Mar 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/area/ruin/unpowered)
"f" = (
/obj/structure/mirror{
desc = "Oh no, seven years of bad luck!";
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
Expand Down Expand Up @@ -56,6 +56,7 @@
/area/ruin/unpowered)
"k" = (
/obj/structure/mirror{
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_y = 28;
broken = 1
Expand All @@ -65,7 +66,7 @@
/area/ruin/unpowered)
"l" = (
/obj/structure/mirror{
desc = "Oh no, seven years of bad luck!";
desc = "This mirror has been shattered. It looks like the bad luck energies spilling from it are taking immediate effect on your surroundings!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
/area/ruin/space/abandoned_tele)
"r" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plating/airless,
/area/ruin/space/abandoned_tele)
"s" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1840,12 +1840,12 @@
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"fu" = (
/obj/machinery/rnd/protolathe,
/obj/machinery/rnd/production/protolathe,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/ancientstation/rnd)
"fv" = (
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plasteel/white,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/spacehotel.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2375,7 +2375,7 @@
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/workroom)
"hr" = (
/obj/item/device/radio/beacon,
/obj/item/device/beacon,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/dock)
"hs" = (
Expand Down
6 changes: 2 additions & 4 deletions _maps/RandomZLevels/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4078,10 +4078,8 @@
pixel_x = 11
},
/obj/structure/mirror{
desc = "Oh no, seven years of bad luck!";
icon_state = "mirror_broke";
pixel_x = 28;
broken = 1
pixel_x = 28
},
/turf/open/floor/plasteel/freezer{
heat_capacity = 1e+006
Expand Down Expand Up @@ -6091,7 +6089,7 @@
"mJ" = (
/obj/structure/sign/warning/vacuum{
desc = "A beacon used by a teleporter.";
icon = 'icons/obj/radio.dmi';
icon = 'icons/obj/device.dmi';
icon_state = "beacon";
name = "tracking beacon"
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomZLevels/undergroundoutpost45.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
"az" = (
/obj/structure/sign/warning/vacuum{
desc = "A beacon used by a teleporter.";
icon = 'icons/obj/radio.dmi';
icon = 'icons/obj/device.dmi';
icon_state = "beacon";
name = "tracking beacon"
},
Expand Down Expand Up @@ -3397,7 +3397,7 @@
},
/area/awaymission/undergroundoutpost45/research)
"hD" = (
/obj/machinery/rnd/protolathe,
/obj/machinery/rnd/production/protolathe,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand Down Expand Up @@ -3670,7 +3670,7 @@
},
/area/awaymission/undergroundoutpost45/research)
"ii" = (
/obj/machinery/rnd/circuit_imprinter,
/obj/machinery/rnd/production/circuit_imprinter,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
Expand Down
Loading