 deathride58
|
cdc23ad79e
|
Merge pull request #4240 from Citadel-Station-13/upstream-merge-33265
[MIRROR] Good Clean Fun: A vending machine for games!
|
2017-12-10 23:50:05 +00:00 |
|
|
CitadelStationBot
|
684ceb2aa8
|
Automatic changelog generation for PR #4315 [ci skip]
|
2017-12-10 17:49:53 -06:00 |
|
|
deathride58
|
57ab98d8bc
|
Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152
[MIRROR] Airlock Construction Update
|
2017-12-10 23:49:51 +00:00 |
|
|
deathride58
|
c116054efc
|
Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361
[MIRROR] Removes juicers
|
2017-12-10 23:49:41 +00:00 |
|
|
deathride58
|
6e6b85c01a
|
Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276
[MIRROR] Restores the uplink modules, removes LoadComponents
|
2017-12-10 23:49:25 +00:00 |
|
|
LetterJay
|
85578cae0d
|
Merge pull request #4316 from deathride58/iconoverridefix
Fixes icon_override only applying to uniforms
|
2017-12-10 17:15:13 -06:00 |
|
|
deathride58
|
4b8c3f808e
|
fixes map conflicts
|
2017-12-10 18:12:33 -05:00 |
|
|
deathride58
|
e46e6dcd1a
|
Delete juicer.dm
|
2017-12-10 18:06:19 -05:00 |
|
|
CitadelStationBot
|
e578bce878
|
Automatic changelog generation for PR #4259 [ci skip]
|
2017-12-10 17:04:36 -06:00 |
|
|
deathride58
|
0475ef46f7
|
Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150
[MIRROR] Makes actionbuttons remember positions where you locked them.
|
2017-12-10 23:04:34 +00:00 |
|
|
deathride58
|
1eb0e42bb1
|
Update uplink_devices.dm
|
2017-12-10 18:04:11 -05:00 |
|
|
deathride58
|
6a8cffc3d5
|
Update implantuplink.dm
|
2017-12-10 18:03:04 -05:00 |
|
|
deathride58
|
9d50222ef6
|
fixes merge conflicts
|
2017-12-10 17:54:20 -05:00 |
|
|
deathride58
|
bfa573f4bd
|
Update alarmlock.dm
|
2017-12-10 17:46:50 -05:00 |
|
|
deathride58
|
01c9cf6479
|
Update preferences.dm
|
2017-12-10 17:45:21 -05:00 |
|
|
CitadelStationBot
|
97588f6f69
|
Automatic changelog generation for PR #4250 [ci skip]
|
2017-12-10 16:44:01 -06:00 |
|
|
deathride58
|
216b0931d1
|
Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
|
2017-12-10 22:43:58 +00:00 |
|
|
CitadelStationBot
|
6fd18b363c
|
Automatic changelog generation for PR #4305 [ci skip]
|
2017-12-10 16:39:05 -06:00 |
|
|
deathride58
|
94d0293703
|
Merge pull request #4305 from Citadel-Station-13/upstream-merge-33413
[MIRROR] Fix MULEbot ID numbers showing nowhere but the alt-click menu
|
2017-12-10 22:39:02 +00:00 |
|
|
deathride58
|
2a481e69df
|
Merge pull request #4307 from Citadel-Station-13/upstream-merge-33400
[MIRROR] Fix catch all blackbox vv guard
|
2017-12-10 22:36:09 +00:00 |
|
|
CitadelStationBot
|
1680b380a9
|
Automatic changelog generation for PR #4246 [ci skip]
|
2017-12-10 16:35:49 -06:00 |
|
|
deathride58
|
ee00ffc8db
|
Merge pull request #4246 from Citadel-Station-13/upstream-merge-31727
[MIRROR] Brain Traumas
|
2017-12-10 22:35:47 +00:00 |
|
|
deathride58
|
fd3b0c72de
|
Update say.dm
|
2017-12-10 17:01:50 -05:00 |
|
|
deathride58
|
a38ccf078b
|
Update borer.dm
|
2017-12-10 16:59:46 -05:00 |
|
|
deathride58
|
7179547be4
|
Merge branch 'master' into upstream-merge-31727
|
2017-12-10 21:51:51 +00:00 |
|
|
deathride58
|
b66e664f11
|
Merge pull request #4309 from Citadel-Station-13/upstream-merge-33415
[MIRROR] Improves the way chem machines handle qdel, fixes some runtimes
|
2017-12-10 21:45:01 +00:00 |
|
|
deathride58
|
fa42a336f3
|
Merge pull request #4310 from Citadel-Station-13/upstream-merge-33320
[MIRROR] Fix runtimes using Tweak Component Ratings on non-machines
|
2017-12-10 21:44:34 +00:00 |
|
|
CitadelStationBot
|
81de010d71
|
Automatic changelog generation for PR #4306 [ci skip]
|
2017-12-10 15:44:01 -06:00 |
|
|
deathride58
|
1a8dd315f9
|
Merge pull request #4306 from Citadel-Station-13/upstream-merge-33391
[MIRROR] Fixes butchered cats not dropping their ears and tails
|
2017-12-10 21:43:59 +00:00 |
|
|
deathride58
|
215a8f47ed
|
Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423
[MIRROR] Undelaying roundend will now reboot the server normally.
|
2017-12-10 21:43:26 +00:00 |
|
|
CitadelStationBot
|
4dde93c027
|
Automatic changelog generation for PR #4308 [ci skip]
|
2017-12-10 15:43:00 -06:00 |
|
|
deathride58
|
4b0137d62e
|
Merge pull request #4308 from Citadel-Station-13/upstream-merge-33418
[MIRROR] Fixes booze-o-mats not having booze
|
2017-12-10 21:42:58 +00:00 |
|
|
CitadelStationBot
|
e63179fb7e
|
Automatic changelog generation for PR #4312 [ci skip]
|
2017-12-10 15:42:22 -06:00 |
|
|
deathride58
|
57b6c893ff
|
Merge pull request #4312 from Citadel-Station-13/upstream-merge-33279
[MIRROR] Standardizes false report weighting
|
2017-12-10 21:42:19 +00:00 |
|
|
CitadelStationBot
|
0a005d8b5c
|
Automatic changelog generation for PR #4314 [ci skip]
|
2017-12-10 15:41:35 -06:00 |
|
|
deathride58
|
93d780997f
|
Merge pull request #4314 from Citadel-Station-13/upstream-merge-33414
[MIRROR] [READY]Fixes beam rifles and flightsuits
|
2017-12-10 21:41:33 +00:00 |
|
|
deathride58
|
85ccdac4d7
|
fixes icon_override only applying to uniforms
|
2017-12-10 16:37:28 -05:00 |
|
|
uraniummeltdown
|
d6b0683846
|
Airlock Construction Update
|
2017-12-10 15:23:34 -06:00 |
|
|
CitadelStationBot
|
ffba092936
|
[READY]Fixes beam rifles and flightsuits
|
2017-12-10 15:19:18 -06:00 |
|
|
oranges
|
30143ee601
|
Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE
[READY]Fixes beam rifles and flightsuits
|
2017-12-10 15:19:18 -06:00 |
|
|
LetterJay
|
d82698d106
|
Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280
[MIRROR] Add caltrop component for spikey floor objects
|
2017-12-10 14:20:40 -06:00 |
|
|
LetterJay
|
336b02e2ba
|
Merge pull request #4301 from Citadel-Station-13/upstream-merge-33396
[MIRROR] Fixes tooltip offsets
|
2017-12-10 14:20:32 -06:00 |
|
|
LetterJay
|
d1074cc29b
|
Merge pull request #4300 from Citadel-Station-13/upstream-merge-33392
[MIRROR] [s]Ghost altclick fix for pet carriers
|
2017-12-10 14:20:23 -06:00 |
|
|
LetterJay
|
de13c6c799
|
Merge pull request #4293 from Citadel-Station-13/upstream-merge-33395
[MIRROR] switches lobes for grammar n shit
|
2017-12-10 14:20:02 -06:00 |
|
|
CitadelStationBot
|
2c2b120c3b
|
Automatic changelog generation for PR #4287 [ci skip]
|
2017-12-10 14:19:53 -06:00 |
|
|
LetterJay
|
563517ab4a
|
Merge pull request #4287 from Citadel-Station-13/upstream-merge-33378
[MIRROR] Makes godwoken syndrome a bit more reliable
|
2017-12-10 14:19:51 -06:00 |
|
|
LetterJay
|
aaeb9331f5
|
tgui recompile
|
2017-12-10 14:19:39 -06:00 |
|
|
CitadelStationBot
|
88958cedfe
|
Standardizes false report weighting
|
2017-12-10 14:15:50 -06:00 |
|
|
oranges
|
4dbac00348
|
Merge pull request #33279 from Robustin/Reported
Standardizes false report weighting
|
2017-12-10 14:15:50 -06:00 |
|
|
oranges
|
d88bff9fa9
|
Restores the uplink modules, removes LoadComponents
|
2017-12-10 14:14:37 -06:00 |
|