Commit Graph

9942 Commits

Author SHA1 Message Date
CitadelStationBot
cf2fb9748e Prevents (cat)grilles from magically regenerating. 2017-12-08 12:24:12 -06:00
Dax Dupont
513a15f463 Prevents grilles from magically regenerating (#33357) 2017-12-08 12:24:12 -06:00
CitadelStationBot
8961c8c369 Automatic changelog generation for PR #4264 [ci skip] 2017-12-08 11:31:17 -06:00
deathride58
33364abc06 Merge pull request #4264 from Citadel-Station-13/upstream-merge-33116
[MIRROR] Adds a medal for getting to the end of the secret tile dialog.
2017-12-08 17:31:14 +00:00
deathride58
d379ec8e41 Merge pull request #4265 from Citadel-Station-13/upstream-merge-33343
[MIRROR] makes cat code better
2017-12-08 17:30:44 +00:00
deathride58
661b9bf888 Merge pull request #4262 from Citadel-Station-13/upstream-merge-33272
[MIRROR] Speeds up some list helpers
2017-12-08 17:19:03 +00:00
CitadelStationBot
a7425b5843 Automatic changelog generation for PR #4261 [ci skip] 2017-12-08 11:18:25 -06:00
deathride58
d826217439 Merge pull request #4261 from Citadel-Station-13/upstream-merge-33235
[MIRROR] Slime Blueprint Change
2017-12-08 17:18:22 +00:00
deathride58
17a077e528 Merge pull request #4258 from Citadel-Station-13/upstream-merge-33350
[MIRROR] panic_address -> panic_server_address
2017-12-08 17:17:47 +00:00
deathride58
f6b3e2158a Merge pull request #4257 from Citadel-Station-13/upstream-merge-33364
[MIRROR] Limit bullet overlays on walls
2017-12-08 17:17:13 +00:00
deathride58
6b8313ee83 Merge pull request #4255 from Citadel-Station-13/upstream-merge-33360
[MIRROR] New integrated circuit manipulator sprites
2017-12-08 17:16:56 +00:00
CitadelStationBot
656c249486 makes cat code better 2017-12-08 10:34:43 -06:00
Tlaltecuhtli
309f82dc9e commit (#33343)
help what is this
2017-12-08 10:34:42 -06:00
CitadelStationBot
fd177dd84c Adds a medal for getting to the end of the secret tile dialog. 2017-12-08 10:34:35 -06:00
Shadowlight213
0496cc9bc7 Adds a medal for getting to the end of the secret tile dialog. (#33116)
* Adds medal for reaching the end of the secret room panel list

* fix
2017-12-08 10:34:35 -06:00
CitadelStationBot
b1d536f02c Speeds up some list helpers 2017-12-08 10:34:20 -06:00
oranges
ec0f2291c9 Merge pull request #33272 from tgstation/Cyberboss-patch-7
Speeds up some list helpers
2017-12-08 10:34:20 -06:00
CitadelStationBot
7f8e97daa1 Slime Blueprint Change 2017-12-08 10:34:13 -06:00
oranges
d619f206c6 Merge pull request #33235 from Fox-McCloud/xenobio-console
Slime Blueprint Change
2017-12-08 10:34:13 -06:00
CitadelStationBot
8a03174a90 panic_address -> panic_server_address 2017-12-08 10:33:46 -06:00
oranges
c5a61bbca5 Merge pull request #33350 from Cyberboss/FixConfig
panic_address -> panic_server_address
2017-12-08 10:33:46 -06:00
CitadelStationBot
b087a5bf9a Limit bullet overlays on walls 2017-12-08 10:33:39 -06:00
AnturK
e1fece081f Limit bullet overlays on walls (#33364)
* Limit bullet overlays on walls

* Whitespace bad

* Okay

* Touching this because I'm testing TGS3 stuff

* Update walls.dm
2017-12-08 10:33:39 -06:00
CitadelStationBot
18e010c1db New integrated circuit manipulator sprites 2017-12-08 10:33:09 -06:00
ACCount
eed4feb5a2 New IC manipulator sprites (#33360) 2017-12-08 10:33:09 -06:00
deathride58
e6fb6a5910 Merge pull request #4249 from Citadel-Station-13/upstream-merge-33308
[MIRROR] Fixes every config flag updating world.sleep_offline
2017-12-08 00:31:38 +00:00
deathride58
ef9e94a128 Merge pull request #4253 from Citadel-Station-13/upstream-merge-33312
[MIRROR] old turf in afterShuttleMove
2017-12-08 00:31:17 +00:00
deathride58
3d6f2810c5 Merge pull request #4251 from Citadel-Station-13/upstream-merge-33318
[MIRROR] Fix vending machines nullspacing every item on init
2017-12-08 00:30:57 +00:00
deathride58
55dbc257b7 Merge pull request #4248 from Citadel-Station-13/upstream-merge-33332
[MIRROR] Fixes light breaking
2017-12-08 00:30:44 +00:00
CitadelStationBot
c8e2f16ea9 old turf in afterShuttleMove 2017-12-06 22:51:09 -06:00
Jordan Brown
28c4705750 Merge pull request #33312 from ninjanomnom/oldturf
old turf in afterShuttleMove
2017-12-06 22:51:09 -06:00
CitadelStationBot
86b92b8fc1 Fix vending machines nullspacing every item on init 2017-12-06 22:48:42 -06:00
Jordan Brown
8f71b88a87 Merge pull request #33318 from AutomaticFrenzy/patch/vendor
Fix vending machines nullspacing every item on init
2017-12-06 22:48:42 -06:00
CitadelStationBot
79617eeb3e Fixes every config flag updating world.sleep_offline 2017-12-06 16:26:49 -06:00
oranges
193879529c Merge pull request #33308 from tgstation/Cyberboss-patch-3
Fixes every config flag updating world.sleep_offline
2017-12-06 16:26:49 -06:00
CitadelStationBot
41a48d8b20 Fixes light breaking 2017-12-06 16:20:31 -06:00
oranges
dc2d191eba Merge pull request #33332 from AnturK/lightfix
Fixes light breaking
2017-12-06 16:20:31 -06:00
deathride58
e7e9a4cc9b Merge pull request #4245 from Citadel-Station-13/upstream-merge-33182
[MIRROR] Fugu improvements
2017-12-06 17:52:03 +00:00
CitadelStationBot
041e47841c Automatic changelog generation for PR #4244 [ci skip] 2017-12-06 11:51:20 -06:00
deathride58
c2d1c38367 Merge pull request #4244 from Citadel-Station-13/upstream-merge-33222
[MIRROR] Makes silicon chat more visible
2017-12-06 17:51:17 +00:00
CitadelStationBot
77ce850dca Automatic changelog generation for PR #4243 [ci skip] 2017-12-06 11:50:50 -06:00
deathride58
bbe7fbfe34 Merge pull request #4243 from Citadel-Station-13/upstream-merge-33294
[MIRROR] Revenant's defile removes salt piles
2017-12-06 17:50:46 +00:00
deathride58
d923d355f2 Merge pull request #4242 from Citadel-Station-13/upstream-merge-32950
[MIRROR] Adds support for non-1:1 screen ratios (Doesn't add widescreen)
2017-12-06 17:50:28 +00:00
CitadelStationBot
fddc58aa8b Fugu improvements 2017-12-06 06:32:50 -06:00
Armhulen
45b9b4956c Fugu improvements (#33182)
* come on, you know i wumbo you wumbo he she me wumbo

* it's hip to wumbo
2017-12-06 06:32:50 -06:00
CitadelStationBot
e55716c8e4 Makes silicon chat more visible 2017-12-06 06:20:27 -06:00
Dax Dupont
4b6660814a Makes sillicon chat more visible (#33222)
Made it green on black

Forgot to remove it at the bold thingy
2017-12-06 06:20:27 -06:00
CitadelStationBot
2afd6b5a43 Revenant's defile removes salt piles 2017-12-06 06:19:17 -06:00
Trevor Serpas
f37df9f0b5 Ghost defile removes salt piles (#33294)
Fixes #33291
2017-12-06 06:19:17 -06:00
deathride58
c1cd970cc4 Merge pull request #4236 from Citadel-Station-13/upstream-merge-33274
[MIRROR] Removes ComponentActivated in favor of callbacks
2017-12-06 03:53:35 +00:00