8a971eaa06
Automatic changelog generation for PR #7005 [ci skip]
2018-06-05 13:15:53 -05:00
1042fa8ff1
Adds @CitadelBot wheelofsalt command ( #7005 )
...
* adds the wheel of salt chat command to tgs3
* fuck i missed a couple things
2018-06-05 11:15:51 -07:00
5bad5f30c4
Merge pull request #7010 from Citadel-Station-13/upstream-merge-38267
...
[MIRROR] Adds missing minerals to /everything closet
2018-06-05 12:11:57 -05:00
d9cf74ce5e
Merge pull request #7009 from Citadel-Station-13/upstream-merge-38275
...
[MIRROR] Fixes recycling the same assembly multiple times
2018-06-05 12:11:47 -05:00
70e1f9d27d
Automatic changelog generation for PR #6995 [ci skip]
2018-06-05 12:11:37 -05:00
5997b69de1
Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240
...
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
2018-06-05 12:11:34 -05:00
b94207ed11
Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223
...
[MIRROR] Slight changes to camera network code
2018-06-05 12:11:19 -05:00
eac5206e51
Merge pull request #6990 from Citadel-Station-13/upstream-merge-38077
...
[MIRROR] Antag reputation rewards are now configurable
2018-06-05 12:10:07 -05:00
08524b71dd
Adds missing minerals to /everything closet
2018-06-05 04:13:56 -05:00
1778c97eeb
Adds missing minerals to /everything closet ( #38267 )
...
* adds bs/ayy minerals to everything closet
* plastic+wood
2018-06-05 04:13:56 -05:00
b4a982f287
Fixes recycling the same assembly multiple times
2018-06-05 04:13:45 -05:00
d3c7dd3802
Fix recycling the same assembly multiple times ( #38275 )
2018-06-05 04:13:44 -05:00
495f0e0749
Automatic changelog generation for PR #7008 [ci skip]
2018-06-04 07:55:39 -05:00
72dd7cc3a5
Merge pull request #7008 from Citadel-Station-13/upstream-merge-38262
...
[MIRROR] New directional beach sprites and corners for the 2018 Summer Ball
2018-06-04 07:55:36 -05:00
65d1bd417a
Automatic changelog generation for PR #7007 [ci skip]
2018-06-04 07:55:20 -05:00
740dbf1ef7
Merge pull request #7007 from Citadel-Station-13/upstream-merge-38069
...
[MIRROR] Adds a Supplypod-delivery admin smite [shh its all good]
2018-06-04 07:55:17 -05:00
c21de57cab
New directional beach sprites and corners for the 2018 Summer Ball
2018-06-04 00:47:46 -05:00
bd6fb5f9e5
New directional beach sprites and corners for the 2018 Summer Ball ( #38262 )
...
* Adds beach corners, interior corners, and other sides in addition to the normal down direction.
* SOMEONE LIED TO ME
* Update misc_plating.dm
* don't copy paste at 4am
* okay there we go
2018-06-04 00:47:45 -05:00
020279e8fb
Adds a Supplypod-delivery admin smite [shh its all good]
2018-06-04 00:37:24 -05:00
678e429dbf
Adds a Supplypod-delivery admin smite ( #38069 )
...
* wa la
* oop forgot an icon
* buildmode compatibility
* ok
* makes centcompod default
* CentCom pods fall faster and are capatilized right
* yike
* yike2
* FASTER
* white space and default icon state
* spacemaniac thanks
2018-06-04 00:37:24 -05:00
8157233145
Update airlock_control.dm
2018-06-03 22:19:52 -04:00
a57bda822b
Update game_options.dm
2018-06-03 22:19:13 -04:00
d5487cfe3a
Merge pull request #6981 from Citadel-Station-13/leechdonate
...
Jar o' Leeches - Donator Item
2018-06-03 22:58:35 +00:00
3a3a9f89f8
Automatic changelog generation for PR #7004 [ci skip]
2018-06-03 16:24:00 -05:00
896eb8cacb
Merge pull request #7004 from Citadel-Station-13/upstream-merge-38257
...
[MIRROR] Fixes some advanced disease thresholds
2018-06-03 16:23:58 -05:00
99ae2dccf6
Automatic changelog generation for PR #7003 [ci skip]
2018-06-03 16:23:50 -05:00
a8eaaff8e7
Merge pull request #7003 from Citadel-Station-13/upstream-merge-38173
...
[MIRROR] Delay smoothing atoms that have not initialized yet
2018-06-03 16:23:48 -05:00
5974ec89c3
Automatic changelog generation for PR #7002 [ci skip]
2018-06-03 16:22:32 -05:00
37ff8a616d
Merge pull request #7002 from Citadel-Station-13/upstream-merge-38225
...
[MIRROR] Include item overlays in attack animations (shows the proper color of screwdrivers etc)
2018-06-03 16:22:30 -05:00
4e7b5bd0c9
Automatic changelog generation for PR #7001 [ci skip]
2018-06-03 16:22:11 -05:00
9c4d7ca029
Merge pull request #7001 from Citadel-Station-13/upstream-merge-38228
...
[MIRROR] we can stop using getFlatIcon?
2018-06-03 16:22:09 -05:00
3607e0db5d
Automatic changelog generation for PR #7000 [ci skip]
2018-06-03 16:21:55 -05:00
5cb9495b84
Merge pull request #7000 from Citadel-Station-13/upstream-merge-38246
...
[MIRROR] Fixed hydroponics tray weed light not turning off when weeds are removed by an integrated circuits device.
2018-06-03 16:21:53 -05:00
d667da2d8d
Automatic changelog generation for PR #6999 [ci skip]
2018-06-03 16:21:39 -05:00
7fdbe8b115
Merge pull request #6999 from Citadel-Station-13/upstream-merge-38244
...
[MIRROR] Adds one brain damage statement
2018-06-03 16:21:37 -05:00
18de1bad24
Automatic changelog generation for PR #6998 [ci skip]
2018-06-03 16:21:21 -05:00
2c6c5bc5d2
Merge pull request #6998 from Citadel-Station-13/upstream-merge-38249
...
[MIRROR] Fixes comms consoles thinking the transit is on centcom
2018-06-03 16:21:19 -05:00
431f48c089
Automatic changelog generation for PR #6997 [ci skip]
2018-06-03 16:21:00 -05:00
c98f998473
Merge pull request #6997 from Citadel-Station-13/upstream-merge-38233
...
[MIRROR] Replaces the black-and-red spacesuit on the infiltrator with a normal syndicate red fatsuit
2018-06-03 16:20:58 -05:00
b3a4fb6560
Automatic changelog generation for PR #6996 [ci skip]
2018-06-03 16:20:33 -05:00
391d4f1cfa
Merge pull request #6996 from Citadel-Station-13/upstream-merge-38245
...
[MIRROR] Readds missing objs to Delta toxins
2018-06-03 16:20:30 -05:00
a3167c00fa
Merge pull request #6993 from Citadel-Station-13/upstream-merge-38215
...
[MIRROR] Fixes datediff not returning
2018-06-03 16:20:12 -05:00
dd70a5ef8b
Automatic changelog generation for PR #6989 [ci skip]
2018-06-03 16:20:01 -05:00
54296cc3e5
Merge pull request #6989 from Citadel-Station-13/upstream-merge-38226
...
[MIRROR] Roboticists now have access to open the R&D windoors.
2018-06-03 16:19:59 -05:00
c96416ed91
Automatic changelog generation for PR #6992 [ci skip]
2018-06-03 16:19:38 -05:00
8bc642c6bd
Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220
...
[MIRROR] Fixes pocket items being deleted when monkeyizing
2018-06-03 16:19:36 -05:00
46790245f9
Automatic changelog generation for PR #6991 [ci skip]
2018-06-03 16:19:18 -05:00
a8274810ab
Merge pull request #6991 from Citadel-Station-13/upstream-merge-38218
...
[MIRROR] Fixes cigar bugs
2018-06-03 16:19:16 -05:00
823b71322a
Fixes some advanced disease thresholds
2018-06-03 15:47:20 -05:00
6791d13e81
Fix some advanced disease thresholds ( #38257 )
2018-06-03 15:47:20 -05:00
CitadelStationBot