83b0a656ea
Merge pull request #5374 from Citadel-Station-13/upstream-merge-35412
...
[MIRROR] Brings certain designs in line with others.
2018-02-08 16:25:30 +00:00
c68a2f652c
Brings certain designs in line with others.
2018-02-08 09:04:46 -06:00
ee77e12bca
Merge pull request #35412 from DaxDupont/flags-are-for-fags
...
Brings certain designs in line with others.
2018-02-08 09:04:46 -06:00
b363799535
cl
2018-02-08 08:14:54 -05:00
69f62c75db
Merge pull request #5372 from Citadel-Station-13/upstream-merge-35447
...
[MIRROR] Fix intendation on embedding datum initializer
2018-02-08 07:13:11 -06:00
7a13591920
Merge pull request #5371 from Citadel-Station-13/upstream-merge-35388
...
[MIRROR] Adds basic trailer support to vehicles
2018-02-08 07:13:04 -06:00
f5666c115a
Merge pull request #5370 from Citadel-Station-13/upstream-merge-35398
...
[MIRROR] Removes an unnecessary type check from autolathe attackby
2018-02-08 07:12:48 -06:00
491caa044a
Automatic changelog generation for PR #5369 [ci skip]
2018-02-08 07:12:35 -06:00
e4319100b5
Merge pull request #5369 from Citadel-Station-13/upstream-merge-35275
...
[MIRROR] SM can explode on space tiles again
2018-02-08 07:12:32 -06:00
27b361b8b4
Automatic changelog generation for PR #5368 [ci skip]
2018-02-08 07:12:15 -06:00
e3067e835a
Merge pull request #5368 from Citadel-Station-13/upstream-merge-34834
...
[MIRROR] Circuit drone + grabber/thrower balance changes
2018-02-08 07:12:13 -06:00
6245d9dddb
Automatic changelog generation for PR #5367 [ci skip]
2018-02-08 07:11:54 -06:00
e548295398
Merge pull request #5367 from Citadel-Station-13/upstream-merge-35346
...
[MIRROR] Fixes cyborg related cuffing issues
2018-02-08 07:11:52 -06:00
75a266ccad
Automatic changelog generation for PR #5366 [ci skip]
2018-02-08 07:11:44 -06:00
35103d74bd
Merge pull request #5366 from Citadel-Station-13/upstream-merge-35296
...
[MIRROR] Heart Disease 2: Electric Boogaloo
2018-02-08 07:11:42 -06:00
bf84d1502b
Merge pull request #5365 from Citadel-Station-13/upstream-merge-35399
...
[MIRROR] [s]Closes exploits in proc calling admin datum procs.
2018-02-08 07:10:55 -06:00
4a5468622a
Merge pull request #5364 from Citadel-Station-13/upstream-merge-35401
...
[MIRROR] [s]Closes exploits in proc calling admin rank datum procs.
2018-02-08 07:10:42 -06:00
468e67189e
Fix intendation on embedding datum initializer
2018-02-08 04:59:18 -06:00
79a4b9be58
Fix intendation on embedding datum initializer ( #35447 )
2018-02-08 04:59:18 -06:00
fdbc58a15c
Adds basic trailer support to vehicles
2018-02-08 03:22:07 -06:00
1cc72fb3d4
Adds basic trailer support to vehicles ( #35388 )
...
* Adds basic trailer support to vehicles
* Move compat.
2018-02-08 03:22:07 -06:00
2f0a0f3497
Removes an unnecessary type check from autolathe attackby
2018-02-08 03:19:50 -06:00
39b6d1fb49
Merge pull request #35398 from ACCount12/pr_atomization
...
Removes an unnecessary type check from autolathe attackby
2018-02-08 03:19:50 -06:00
527222e031
SM can explode on space tiles again
2018-02-08 03:13:28 -06:00
6dc78e0201
SM can explode on space tiles again ( #35275 )
...
* Reordered some of the SM logic
* make it a little slower
* It does not explode instantly i tested
2018-02-08 03:13:28 -06:00
11518a644c
Circuit drone + grabber/thrower balance changes
2018-02-08 03:11:12 -06:00
c066120fc0
Circuit drone + grabber/thrower balance changes ( #34834 )
...
* makes grabbers bulky and inventory max bulky
* makes circuit drones bulky
* removes drone stacking
* made grabbers max w class based on drone assembly, changed their w class back to small
* review stuff
* makes throwers max_w_class depend on assembly size
* uh
* kills sheer heart attack
* fuck off
* FUCK
* GR
2018-02-08 03:11:12 -06:00
cbe5a42dda
Fixes cyborg related cuffing issues
2018-02-08 03:07:52 -06:00
d427e0174b
Merge pull request #35346 from DaxDupont/kinky-cuffs
...
Fixes cyborg related cuffing issues
2018-02-08 03:07:51 -06:00
7af7100e46
Heart Disease 2: Electric Boogaloo
2018-02-08 03:02:30 -06:00
9c957f5a0b
Heart Disease 2: Electric Boogaloo ( #35296 )
...
* Heart Disease 2: Electric Boogaloo
* Upd8
2018-02-08 03:02:29 -06:00
7402b9f48a
[s]Closes exploits in proc calling admin datum procs.
2018-02-08 02:55:07 -06:00
06a1d39595
[s]Closes exploits in proc calling admin datum procs. ( #35399 )
...
* Closes exploits in proc calling admin datum procs.
There is likely one in ranks, but that can be its own pr.
* Update holder2.dm
2018-02-08 02:55:07 -06:00
219fb6c3ca
[s]Closes exploits in proc calling admin rank datum procs.
2018-02-08 02:54:55 -06:00
76ec67f246
Merge pull request #35401 from MrStonedOne/patch-475
...
[s]Closes exploits in proc calling admin rank datum procs.
2018-02-08 02:54:55 -06:00
592a527c24
Automatic changelog generation for PR #5363 [ci skip]
2018-02-08 00:30:50 -06:00
6043f3a852
Merge pull request #5363 from Citadel-Station-13/upstream-merge-35409
...
[MIRROR] Belts now have inhand sprites
2018-02-08 00:30:48 -06:00
ef1ffa5ac0
Automatic changelog generation for PR #5362 [ci skip]
2018-02-08 00:30:33 -06:00
c8b7e5dc7a
Merge pull request #5362 from Michiyamenotehifunana/nekomimi-port
...
Ports TG's nekomimi to Cit's mammal sprite accessories system
2018-02-08 00:30:31 -06:00
5b59c73071
Automatic changelog generation for PR #5361 [ci skip]
2018-02-08 00:30:15 -06:00
76702c61e7
Merge pull request #5361 from deathride58/nightlightfix
...
Fixes night lighting not going into effect properly at the start of the round
2018-02-08 00:30:13 -06:00
abfb5bb571
Belts now have inhand sprites
2018-02-07 23:48:18 -06:00
bbf970c213
Merge pull request #35409 from epochayur/master
...
Belts now have inhand sprites
2018-02-07 23:48:17 -06:00
ca8a8e12bf
Ports TG nekomimi to Cit's mammal sprite accessories system
2018-02-08 12:59:01 +08:00
d5bfa7afca
Automatic changelog generation for PR #5360 [ci skip]
2018-02-07 21:30:43 -06:00
47bf1e37a7
Merge pull request #5360 from Citadel-Station-13/upstream-merge-35168
...
[MIRROR] adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free
2018-02-08 03:30:41 +00:00
2e255f3b8b
fixes nightlights not dimming properly at the start of the round
2018-02-07 22:27:29 -05:00
3261fc08cf
adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free
2018-02-07 20:23:32 -06:00
2d499b938c
adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free ( #35168 )
...
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want
* dirty vars
* Vars
* changes windoor to proper subtype, removed extra circular saw
* area/space to area/ruin/unpowered, added gps tag
* in area/space nobody can hear you scream
* Update mrow_thats_right.dmm
if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes
* cat
2018-02-07 20:23:32 -06:00
717da969a6
[MIRROR] Var cleanup and map fixes ( #5359 )
...
* Merge pull request #35429 from ShizCalev/snowdin-cleanup
Var cleanup and map fixes
* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
deathride58