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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Jordan Brown
|
b3243d5900
|
Removes old ass belt.dm (#31317)
|
2017-10-05 15:31:56 -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 |
|
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
|
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
|
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
|
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
|
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
|
cedb56af1b
|
Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
|
2017-10-05 03:05:32 -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 |
|
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
|
365adf852c
|
Merge branch 'master' into upstream-merge-31222
|
2017-10-04 21:50:07 -04:00 |
|
Supermichael777
|
63aa1c7153
|
Makes the pda font a prefernce
|
2017-10-04 19:28:57 -05:00 |
|
Leo
|
39cf9bb7a0
|
Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
|
2017-10-04 19:26:38 -05:00 |
|
Leo
|
dec28eabfc
|
Merge pull request #31287 from ShizCalev/wizard-name
Correctly applies wizard names
|
2017-10-04 19:26:31 -05:00 |
|
LetterJay
|
13cf0696e0
|
Merge branch 'master' into upstream-merge-31198
|
2017-10-04 19:06:42 -04:00 |
|
LetterJay
|
1a70aa0227
|
Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
|
2017-10-04 19:06:02 -04:00 |
|
LetterJay
|
9ee8b6298f
|
Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275
[MIRROR] Adds deconstruction hints to various things
|
2017-10-04 18:44:50 -04:00 |
|
LetterJay
|
b2184c1a78
|
Update cult_structures.dm
|
2017-10-04 17:38:01 -05:00 |
|
oranges
|
25cf971fef
|
Merge pull request #31275 from kingofkosmos/moredeconhints
Adds deconstruction hints to various things
|
2017-10-04 16:33:51 -05:00 |
|
kevinz000
|
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 |
|
bawhoppen
|
460fea66c8
|
Moves all stack object sprites from items_and_weapons.dmi to their own file
|
2017-10-04 11:59:53 -05:00 |
|
ExcessiveUseOfCobblestone
|
fe5b45dfeb
|
Fixes Carpsie nullrod from being invisible (#31268)
|
2017-10-04 11:00:34 -05:00 |
|
LetterJay
|
719b433ede
|
Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
|
2017-10-04 02:14:07 -04:00 |
|
LetterJay
|
0830e6907e
|
Merge pull request #3093 from Kevak/Shock-Collars
Shock Collars Are Now A Thing.
|
2017-10-03 20:16:10 -04:00 |
|
LetterJay
|
d483932395
|
Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232
[MIRROR] Fixes mech fab runtime
|
2017-10-03 20:13:06 -04:00 |
|
LetterJay
|
3e975eca09
|
Merge pull request #3107 from Citadel-Station-13/upstream-merge-31135
[MIRROR] Adds a var to minds that makes them immune to conversion
|
2017-10-03 20:12:43 -04:00 |
|
LetterJay
|
84d98d5973
|
Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208
[MIRROR] Makes mobs on fire light up
|
2017-10-03 20:12:24 -04:00 |
|
LetterJay
|
b9967e6453
|
Update medical.dm
|
2017-10-03 18:48:43 -05:00 |
|
AnturK
|
67f0c2f41c
|
Fixes mech fab runtime (#31232)
* Dunno what the initial was about, it's a list.
* Proper fixup
* Typo
|
2017-10-03 18:19:40 -05:00 |
|
XDTM
|
1782fbeed7
|
Adds the advanced medical scanner, gives one to the CMO
|
2017-10-03 18:16:29 -05:00 |
|
oranges
|
5c49bab3c5
|
Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
|
2017-10-03 18:15:20 -05:00 |
|
oranges
|
baa53ba1d3
|
Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA
Makes mobs on fire light up
|
2017-10-03 18:14:10 -05:00 |
|
KorPhaeron
|
4e648765db
|
Ports dash weapons to the dash datum
|
2017-10-03 18:11:42 -05:00 |
|
ShizCalev
|
d98cd745dd
|
Fixes morgue maintenance radstorm protection (#31253)
* Morgue maint area
* Fixed typo
|
2017-10-03 17:11:57 -05:00 |
|
Kevak
|
ba99e3845a
|
Added normal collar functionality.
You can now name your victim's collars on top of other functionality.
|
2017-10-03 12:12:52 -07:00 |
|
LetterJay
|
0b7ef4d90f
|
Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233
[MIRROR] Fixes floating bullet holes
|
2017-10-03 12:31:59 -04:00 |
|
LetterJay
|
660e9fea9c
|
Merge pull request #3088 from Citadel-Station-13/upstream-merge-30846
[MIRROR] Fixes/tweaks wormholes event and portals
|
2017-10-03 12:29:46 -04:00 |
|
Kevak
|
f4ce4a3a27
|
Shock Collars Are Now A Thing.
Exactly what it says on the tin.
|
2017-10-03 08:03:03 -07:00 |
|