Commit Graph

6371 Commits

Author SHA1 Message Date
oranges
5a390937ae Fix spelling of conscious 2017-10-06 01:34:33 -05:00
CitadelStationBot
446c075fa1 Automatic changelog generation for PR #3170 [ci skip] 2017-10-06 01:14:17 -05:00
LetterJay
6ce704ce21 Merge pull request #3170 from Citadel-Station-13/upstream-merge-31325
[MIRROR] Makes Ocular Wardens effective again
2017-10-06 02:14:15 -04:00
CitadelStationBot
3f761e3403 Automatic changelog generation for PR #3168 [ci skip] 2017-10-06 01:14:04 -05:00
LetterJay
3fef939f20 Merge pull request #3168 from Citadel-Station-13/upstream-merge-31321
[MIRROR] Makes a couple of atmos procs a tiny bit faster, removes /datum/gas_mixture/thermal_energy()
2017-10-06 02:14:03 -04:00
LetterJay
8c6f145087 Merge pull request #3167 from Citadel-Station-13/upstream-merge-31316
[MIRROR] Fixes rubber shot after unintended nerf.
2017-10-06 02:13:51 -04:00
LetterJay
d21f68028d Merge pull request #3166 from Citadel-Station-13/upstream-merge-31315
[MIRROR] Removes shitty sleep from area/Entered
2017-10-06 02:13:22 -04:00
LetterJay
d4f4b711a0 Merge pull request #3164 from Citadel-Station-13/upstream-merge-31317
[MIRROR] Removes old ass belt.dm
2017-10-06 02:13:03 -04:00
CitadelStationBot
31febed849 Automatic changelog generation for PR #3163 [ci skip] 2017-10-06 01:12:44 -05:00
LetterJay
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
LetterJay
57a92cf9f4 Merge pull request #3162 from Citadel-Station-13/upstream-merge-30989
[MIRROR] Makes angle2dir() much more accurate
2017-10-06 02:12:35 -04:00
CitadelStationBot
6c77fa5cb6 Automatic changelog generation for PR #3160 [ci skip] 2017-10-06 01:12:23 -05:00
LetterJay
655467f966 Merge pull request #3160 from Kevak/Spritefixes
Plasmamans now have organssprites again.
2017-10-06 02:12:21 -04:00
CitadelStationBot
e1a72d16ab Automatic changelog generation for PR #3159 [ci skip] 2017-10-06 01:12:08 -05:00
LetterJay
6546804c38 Merge pull request #3159 from Citadel-Station-13/upstream-merge-30525
[MIRROR] Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
2017-10-06 02:12:06 -04:00
LetterJay
98545cd5c3 Merge pull request #3158 from Citadel-Station-13/upstream-merge-31298
[MIRROR] Fixes crafting stacks without breaking crafted machinery
2017-10-06 02:11:45 -04:00
CitadelStationBot
4fc286289e Automatic changelog generation for PR #3157 [ci skip] 2017-10-06 01:11:34 -05:00
LetterJay
bc2988dc74 Merge pull request #3157 from Citadel-Station-13/upstream-merge-31304
[MIRROR] Adds wigs
2017-10-06 02:11:32 -04:00
LetterJay
7ba800a523 Merge pull request #3156 from Citadel-Station-13/upstream-merge-31310
[MIRROR] Fixes lobby timer showing as delayed when it's just waiting for more players
2017-10-06 02:11:22 -04:00
LetterJay
d50c1034b9 Update type2type.dm 2017-10-05 22:44:50 -05:00
LetterJay
52c57543cb Update misc_special.dm 2017-10-05 22:43:08 -05:00
CitadelStationBot
1a21b15cbf Makes Ocular Wardens effective again 2017-10-05 19:22:29 -05:00
Joan Lung
4d06415a4b Makes Ocular Wardens effective again (#31325)
* Makes Ocular Wardens effective again

* get that, too
2017-10-05 19:22:29 -05:00
CitadelStationBot
def41cf98c Makes a couple of atmos procs a tiny bit faster, removes /datum/gas_mixture/thermal_energy() 2017-10-05 17:58:54 -05:00
vuonojenmustaturska
648040de9c Makes a couple of atmos procs a tiny bit faster, removes /datum/gas_mixture/thermal_energy() (#31321)
* Atmos stuff

* moved the define
2017-10-05 17:58:54 -05:00
CitadelStationBot
e5fc629997 Fixes rubber shot after unintended nerf. 2017-10-05 17:48:37 -05:00
The-clown-known-as-Pepe
13eedff767 Fixes rubber shot after unintended nerf. (#31316)
* Update bullets.dm

* fix

* refactor

* Update ammo_casings.dm
2017-10-05 17:48:37 -05:00
CitadelStationBot
1456d09dc9 Removes shitty sleep from area/Entered 2017-10-05 17:43:23 -05:00
oranges
645d8fdc7c Merge pull request #31315 from tgstation/Cyberboss-patch-3
Removes shitty sleep from area/Entered
2017-10-05 17:43:23 -05:00
CitadelStationBot
716c80d7c9 Removes old ass belt.dm 2017-10-05 15:31:56 -05:00
Jordan Brown
b3243d5900 Removes old ass belt.dm (#31317) 2017-10-05 15:31:56 -05:00
CitadelStationBot
09a38a8f38 Emotes now shatter 80% less immersions 2017-10-05 15:11:28 -05:00
Robustin
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
Joan Lung
2a75083f80 Makes angle2dir() much more accurate 2017-10-05 15:05:13 -05:00
Kevak
a5f86b1e67 Fixes plasmaman sprites 2017-10-05 09:59:13 -07:00
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
CitadelStationBot
13ef4a3a7a Fixes crafting stacks without breaking crafted machinery 2017-10-05 09:25:08 -05:00
YPOQ
33364920b3 Fixes crafting stacks without breaking crafted machinery (#31298)
* Revert "Fixes stacking when crafting items"

* Fixes crafted stacked items properly

* Update stack.dm
2017-10-05 09:25:08 -05:00
AnturK
f45344ed8c Adds wigs 2017-10-05 09:23:56 -05:00
CitadelStationBot
83841be340 Fixes lobby timer showing as delayed when it's just waiting for more players 2017-10-05 09:21:43 -05:00
Jordan Brown
f91dc76e1a Merge pull request #31310 from ShizCalev/lobby-timer-fix
Fixes lobby timer showing as delayed when it's just waiting for more players
2017-10-05 09:21:43 -05:00
LetterJay
cf37555c4d Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302
[MIRROR] Move shuttleRotate into the shuttle module
2017-10-05 09:13:41 -04:00
LetterJay
40b8365924 Merge pull request #3154 from Citadel-Station-13/upstream-merge-31294
[MIRROR] Fix abductor scientist being unable to use science tool
2017-10-05 09:13:06 -04:00
CitadelStationBot
18465adc90 Automatic changelog generation for PR #3153 [ci skip] 2017-10-05 08:12:46 -05:00
LetterJay
de8803ce6d Merge pull request #3153 from Citadel-Station-13/upstream-merge-31290
[MIRROR]  Fixes jaunters chasm-saving feature
2017-10-05 09:12:45 -04:00
LetterJay
a1ae6add27 Merge pull request #3152 from Citadel-Station-13/upstream-merge-31296
[MIRROR] Cleans up and fixes old landmarks
2017-10-05 09:12:35 -04:00
LetterJay
a277c5b3d1 Merge pull request #3150 from Citadel-Station-13/upstream-merge-31291
[MIRROR] Cleans up non-timid shuttle templates & some dirty vars
2017-10-05 09:12:23 -04:00
LetterJay
805913f107 Merge pull request #3149 from Citadel-Station-13/upstream-merge-31269
[MIRROR] Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
2017-10-05 09:12:09 -04:00
CitadelStationBot
e84b7a7af6 Automatic changelog generation for PR #3148 [ci skip] 2017-10-05 08:11:39 -05:00
LetterJay
929b67a61a Merge pull request #3148 from Citadel-Station-13/upstream-merge-31244
[MIRROR] Lizzers and plasmamen can now be servants of Ratvar
2017-10-05 09:11:38 -04:00