Commit Graph

4492 Commits

Author SHA1 Message Date
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
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
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
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
Joan Lung
2a75083f80 Makes angle2dir() much more accurate 2017-10-05 15:05:13 -05: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
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
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
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
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
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
LetterJay
b031f0734e Merge pull request #3147 from Citadel-Station-13/upstream-merge-31277
[MIRROR] Moved admin music volume slider to its own menu
2017-10-05 09:10:47 -04:00
LetterJay
0dfed4dfb7 Merge pull request #3145 from Citadel-Station-13/upstream-merge-31255
[MIRROR] Makes shuttle movement a bit smoother and faster
2017-10-05 08:47:16 -04:00
LetterJay
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
LetterJay
ce933f19e0 Merge pull request #3142 from Citadel-Station-13/upstream-merge-31193
[MIRROR] Makes the pda font a prefernce
2017-10-05 08:38:19 -04:00
LetterJay
c600fc7846 Merge pull request #3141 from Citadel-Station-13/upstream-merge-31284
[MIRROR] Code cleanup in snack_meats.dm
2017-10-05 08:32:28 -04:00
LetterJay
29aafaf42d Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286
[MIRROR] ismachinery define
2017-10-05 08:32:10 -04:00
LetterJay
b374f2c22d Merge pull request #3139 from Citadel-Station-13/upstream-merge-31287
[MIRROR] Correctly applies wizard names
2017-10-05 08:31:56 -04:00
LetterJay
90a66c9944 Merge pull request #3138 from Citadel-Station-13/upstream-merge-31289
[MIRROR] Makes the energy katana swwwwwwish when drawn
2017-10-05 08:31:42 -04:00
LetterJay
915e79e59b Merge pull request #3135 from Citadel-Station-13/upstream-merge-31281
[MIRROR] Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
2017-10-05 08:31:23 -04:00
LetterJay
3d364f08f2 Update holder.dm 2017-10-05 07:11:14 -05:00
LetterJay
8e1a31c8af Update holder.dm 2017-10-05 06:51:59 -05:00
Leo
5a0d1e5aeb Merge pull request #31294 from YPOQ/sciencetoolfix
Fix abductor scientist being unable to use science tool
2017-10-05 06:49:54 -05:00
Leo
ced865f76d Merge pull request #31290 from YPOQ/jaunterfix
Fixes jaunters chasm-saving feature
2017-10-05 06:48:42 -05:00
LetterJay
47b72055cd Update shuttle.dm 2017-10-05 05:19:49 -05:00
LetterJay
abeb003465 Update preferences_savefile.dm 2017-10-05 05:18:04 -05:00
LetterJay
f9cd7aa5b3 Merge branch 'master' into upstream-merge-31289 2017-10-05 06:15:44 -04:00
LetterJay
08f3503a81 Update holder.dm 2017-10-05 05:14:27 -05:00
LetterJay
05770366b5 Merge pull request #3122 from Citadel-Station-13/upstream-merge-31273
[MIRROR] Moves all stack object sprites from items_and_weapons.dmi to their own file
2017-10-05 06:10:55 -04:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
oranges
cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
oranges
574e166951 Merge pull request #31269 from Firecage/doublehardsuitrebalance
Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
2017-10-05 03:02:11 -05:00
Ashe Higgs
682269ab63 Lizzers and plasmamen can now be servants of Ratvar (#31244)
* Removes racial discrimination from Ratvar's servants

* Activates plasma internals; thank you Y0SH1M4S73R!

* Update clock_cult.dm
2017-10-05 03:01:01 -05:00
JJRcop
4ecc019353 Moved admin music volume slider to its own menu (#31277)
* Moved admin music volume slider to its own menu

* Minor fixes to goonchat
2017-10-05 02:59:52 -05:00
Emmett Gaines
d50c0e10f6 Makes shuttle movement a bit smoother and faster 2017-10-05 02:31:10 -05:00
RandomMarine
fb7a0d7606 Experimental fix for bloom issue (#31299) 2017-10-04 23:25:06 -05:00
LetterJay
e6830cfec3 Merge pull request #3103 from Citadel-Station-13/upstream-merge-31222
[MIRROR] Ports dash weapons to the dash datum
2017-10-04 23:01:59 -04:00
LetterJay
c2d8f048f8 Update cult_items.dm 2017-10-04 21:49:46 -05:00
LetterJay
7c4373c1fe Update cult_items.dm 2017-10-04 21:15:11 -05:00
LetterJay
f57929b26c Update book.dm 2017-10-04 21:14:25 -05:00
LetterJay
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
LetterJay
09f6eb6156 Update preferences_savefile.dm 2017-10-04 20:53:42 -05:00
LetterJay
4c38a8b1e2 Update energy_katana.dm 2017-10-04 20:51:37 -05:00
LetterJay
365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -04:00