e880545425
Fixes emote runtimes ( #31498 )
...
* Emote runtime
* Bleh didn't add all
2017-10-10 08:42:30 -05:00
b7c65c7482
Merge pull request #3274 from Citadel-Station-13/upstream-merge-31492
...
[MIRROR] Fixes xeno mass confusion
2017-10-10 05:55:38 -04:00
c3533fee76
Merge pull request #3269 from Citadel-Station-13/upstream-merge-31408
...
[MIRROR] Makes cameras work on shuttles
2017-10-10 05:54:33 -04:00
0331110388
Merge pull request #3268 from Citadel-Station-13/upstream-merge-31416
...
[MIRROR] Clockwork Golems will not slip on glass
2017-10-10 05:54:18 -04:00
b0c833059e
Update chunk.dm
2017-10-10 04:40:26 -05:00
429543f4ae
Merge pull request #31492 from ShizCalev/sometimes-i-drink-a-glass-of-water-just-to-suprise-my-liver
...
Fixes xeno mass confusion
2017-10-10 03:22:03 -05:00
494bb0222c
Makes cameras work on shuttles
2017-10-10 03:15:13 -05:00
5d3a805d30
Merge pull request #31416 from Armhulen/patch-2
...
Clockwork Golems will not slip on glass
2017-10-10 03:14:01 -05:00
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
4f033a7137
Merge pull request #3244 from Citadel-Station-13/upstream-merge-31422
...
[MIRROR] Internals set to 0 pressure will properly prevent breathing environment air
2017-10-08 23:35:56 -04:00
7d4b0961f0
Merge pull request #3243 from Citadel-Station-13/upstream-merge-31358
...
[MIRROR] Basilisks are now gold core spawnable: Cyberboss likes me this time edition
2017-10-08 23:35:43 -04:00
a49441b1e2
Internals set to 0 pressure will prevent breathing environment air ( #31422 )
2017-10-08 19:09:34 -05:00
62a6867f2e
Makes Basilisks gold slime spawnable. ( #31358 )
2017-10-08 18:30:45 -05:00
687b329b7b
Update pai.dm ( #31379 )
2017-10-08 15:47:32 -05:00
5e2deeff84
Merge pull request #3232 from Citadel-Station-13/upstream-merge-31411
...
[MIRROR] Dedicated equipment removal proc
2017-10-08 16:24:20 -04:00
56f05a8476
Merge pull request #3230 from Citadel-Station-13/upstream-merge-31414
...
[MIRROR] Fixes mob swap on tables.
2017-10-08 16:23:43 -04:00
f046f4f15b
Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413
...
[MIRROR] Removes useless commented-out what-if code from the 1970s
2017-10-08 16:22:10 -04:00
4c408f4541
Update give.dm
2017-10-08 14:55:37 -05:00
3f975a63b7
Dedicated equipment removal proc ( #31411 )
...
* Dedicated equipment removal proc
* department of redundancy department
* Whitespace makes me angry
2017-10-08 13:18:12 -05:00
b5981147dd
Fixes mob swap on tables. ( #31414 )
2017-10-08 13:15:50 -05:00
58fd7f2067
Merge pull request #31413 from vuonojenmustaturska/codejanitoring
...
Removes useless commented-out what-if code from the 1970s
2017-10-08 10:00:34 -05:00
641ffe003b
Update silicon.dm
2017-10-07 22:51:58 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
03bd841ac3
Merge pull request #3191 from Citadel-Station-13/upstream-merge-31344
...
[MIRROR] Lightgeists are gold core spawnable
2017-10-07 01:07:03 -04:00
7e547fa2cd
Merge pull request #3189 from Citadel-Station-13/upstream-merge-31359
...
[MIRROR] Adds Wumborian Fugu to the gold core spawn
2017-10-07 01:06:46 -04:00
a42bf62334
Lightgeists are gold core spawnable ( #31344 )
...
* buff chainsaws 2: electric boogaloo
sned help
* Revert "helps chainsaws out"
This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.
* helps chainsaws out
i'm sorry we hurt you chainsaws
* i'm not stupid i'm misguided!
but i actually totally agree with this so !go kor!
* AH, BINGO.
* ez
* honk
2017-10-06 21:30:23 -05:00
0a3949968d
Makes Wumborian Fugu gold core spawnable ( #31359 )
2017-10-06 21:28:04 -05:00
5a390937ae
Fix spelling of conscious
2017-10-06 01:34:33 -05:00
020b3b1160
Merge pull request #3163 from Citadel-Station-13/upstream-merge-31240
...
[MIRROR] Emotes now shatter 80% less immersions
2017-10-06 02:12:43 -04:00
c8e5928517
Emotes now shatter 80% less immersions ( #31240 )
...
* Emote Checks by Default
* Removes emote argument
* More emote fixes
* Overhauled emote check
* Closed Spans
2017-10-05 15:11:28 -05:00
5b0b2fd5bb
Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
2017-10-05 10:53:47 -05:00
f418c066c6
Merge pull request #3144 from Citadel-Station-13/upstream-merge-31299
...
[MIRROR] Experimental fix for #29663
2017-10-05 08:45:55 -04:00
29aafaf42d
Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286
...
[MIRROR] ismachinery define
2017-10-05 08:32:10 -04:00
fb7a0d7606
Experimental fix for bloom issue ( #31299 )
2017-10-04 23:25:06 -05:00
d4cd519730
Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276
...
[MIRROR] Moves laughter to the emote
2017-10-04 22:01:49 -04:00
39cf9bb7a0
Merge pull request #31286 from KorPhaeron/ismachinery
...
ismachinery define
2017-10-04 19:26:38 -05:00
3fdc29ba42
Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283
...
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
2017-10-04 18:45:09 -04:00
ecf44ff651
Merge pull request #3131 from Citadel-Station-13/upstream-merge-31150
...
[MIRROR] Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
2017-10-04 18:44:21 -04:00
e6ccc7077a
Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279
...
[MIRROR] why plus a minus value and not just minus the value...
2017-10-04 18:43:04 -04:00
cfd98caf98
Update emote.dm
2017-10-04 17:42:38 -05:00
8c77408bb1
Merge pull request #3114 from Daniel0Mclovin/patch-2
...
Rebalanced pod people so they arnt as weak.
2017-10-04 18:42:02 -04:00
944c749dfc
Merge pull request #3117 from Citadel-Station-13/upstream-merge-31256
...
[MIRROR] Zombies regen toxin damage
2017-10-04 18:41:45 -04:00
929c737dfe
Fixes shaking people up while buckled into a bed/resin nest ( #31283 )
...
* Fixes shaking people up when buckled into bed
* CB
2017-10-04 17:01:27 -05:00
4d23dd56b8
Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower ( #31150 )
...
* Hides ninja socks, draining updated to DisplayPower
* CB
* KEEP_TOGETHER
2017-10-04 16:29:30 -05:00
77c422d011
Update emote.dm
2017-10-04 16:11:24 -05:00
1a3fc9f1c6
why plus a minus value and not just minus the value... ( #31279 )
...
* Update bullets.dm
* Update visuals_icons.dm
* Update asteroid.dm
2017-10-04 14:03:20 -05:00
441514937e
Moves laughter to the emote
2017-10-04 12:20:23 -05:00
c03513b65d
Merge pull request #31256 from ShizCalev/zombie-toxin
...
Zombies regen toxin damage
2017-10-04 06:14:57 -05:00
cdc7695741
Makes gutlunches hungry for gibs again ( #31241 )
...
* gutlunch fix
* combine ifs, removes unneeded check
2017-10-04 04:11:33 -05:00
AnturK