shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,845 Commits 5 Branches 0 Tags
11ca5afc9213f3ed524eacf9ff09bc552e17bb44
Commit Graph

1480 Commits

Author SHA1 Message Date
LetterJay
11ca5afc92 Merge pull request #4546 from Citadel-Station-13/upstream-merge-33834 
[MIRROR] Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
 2017-12-27 03:03:16 -06:00
Jordan Brown
4499ff2fad Merge pull request #33834 from Xhuis/drone_hats 
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
 2017-12-26 18:38:42 -06:00
YPOQ
752e3f7378 Fixes AI camera lights not updating when tracking mobs (#33849) 2017-12-26 18:30:24 -06:00
CitadelStationBot
8aed987bd9 [MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544) 
* Fixes emagged cleanbot acid attack doing no damage (#33848)

* Fixes emagged cleanbot acid attack doing no damage
 2017-12-26 13:58:16 -08:00
LetterJay
290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay
358c625ed3 Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590 
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
 2017-12-26 05:59:52 -06:00
LetterJay
4cefd9219f Update say.dm 2017-12-25 21:32:05 -06:00
LetterJay
a7a0823594 Update say.dm 2017-12-25 21:31:50 -06:00
LetterJay
5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
coiax
703667bdff Ghosts can *spin and *flip 2017-12-25 17:11:29 -06:00
LetterJay
6205268f7e Merge pull request #4441 from Citadel-Station-13/upstream-merge-33661 
[MIRROR] [HIGH PRIORITY]Hotfix for the monkeylike disability
 2017-12-25 07:28:52 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
deathride58
d8e25d9501 Merge pull request #4499 from Citadel-Station-13/upstream-merge-33713 
[MIRROR] if the deflection chance is < 100%, it won't say they can never be hit by ranged weapons
 2017-12-24 23:06:28 +00:00
LetterJay
0f86dd3f72 Merge pull request #4515 from Citadel-Station-13/upstream-merge-33306 
[MIRROR] Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-24 17:00:06 -06:00
Jordan Brown
af1f13e114 Merge pull request #33306 from coiax/replace-clean-flag-with-component 
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-23 08:36:37 -06:00
coiax
f40d74e52f Gibber rebalance (#33737) 
🆑 coiax
balance: The kitchen gibber must be anchored in order to use.
balance: The gibber requires bodies to have no external items or
equipment.
/🆑

Unanchoring the gibber, running around with it, ebowing people, then
shoving them in is not fun.

As a double check, you REALLY should be stripping them of all that
cloth, it'll jam up the gears.

- Removes the abiotic() proc, it's literally used only in the gibber.
 2017-12-22 18:03:38 -06:00
kevinz000
bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06:00
Armhulen
716e4da53e cool beans, partner (#33713) 2017-12-22 10:39:14 -06:00
deathride58
53e7d47893 Merge pull request #4407 from Citadel-Station-13/upstream-merge-33581 
[MIRROR] add view range respects widescreen
 2017-12-21 20:19:04 +00:00
Matthew
529e839203 dog borgs module icon fix 2017-12-21 13:46:44 -06:00
LetterJay
d66b64b1f1 Merge pull request #4466 from Michiyamenotehifunana/xeno-nerf 
Removes pierce immunity from roundstart xenos
 2017-12-21 04:59:00 -06:00
LetterJay
3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
deathride58
680e44fb64 Update observer.dm 2017-12-20 22:56:46 -05:00
deathride58
b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 
[MIRROR] [Ready]Brain Trauma additions
 2017-12-21 03:42:38 +00:00
deathride58
a30bcfa77f Merge pull request #4465 from Citadel-Station-13/upstream-merge-33669 
[MIRROR] Makes tails stop wagging when unconscious or stunned
 2017-12-21 03:26:00 +00:00
deathride58
2de3b12364 Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594 
[MIRROR] Adds knock off component
 2017-12-21 03:25:41 +00:00
Michiyamenotehifunana
2be1b5eb29 Removes pierce immunity from roundstart xenos 2017-12-20 23:05:05 +08:00
ShizCalev
b83dd93309 lizard stuff (#33669) 2017-12-20 05:55:45 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Jordan Brown
25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
LetterJay
efc41a15d3 Update mob_helpers.dm 2017-12-19 19:36:03 -06:00
LetterJay
6c39e94bba Update observer.dm 2017-12-19 17:56:52 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
ACCount
522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LetterJay
8fef308d0a Update living_defense.dm 2017-12-18 17:27:04 -06:00
LetterJay
64f003d3b1 Update living.dm 2017-12-18 17:26:25 -06:00
LetterJay
0d137f82d4 Update life.dm 2017-12-18 17:26:10 -06:00
LetterJay
8b56d1ccdd Update combat.dm 2017-12-18 17:26:01 -06:00
LetterJay
078c8744e0 Update species.dm 2017-12-18 17:25:47 -06:00
LetterJay
e4d6f4110f Update human_defense.dm 2017-12-18 17:25:33 -06:00
LetterJay
10eaeed06b Update carbon.dm 2017-12-18 17:25:09 -06:00
XDTM
13dd125e28 [HIGH PRIORITY]Hotfix for the monkeylike disability 2017-12-18 16:11:27 -06:00
LetterJay
e933d69a22 Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302 
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
 2017-12-18 15:27:12 -06:00
LetterJay
ba5306c8fe Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568 
[MIRROR] Fixes zombie stun immunity, more pep in their step
 2017-12-18 15:25:13 -06:00
LetterJay
3df26e3be6 Merge pull request #4413 from Citadel-Station-13/upstream-merge-33569 
[MIRROR] Fixes a brain login runtime
 2017-12-18 15:20:48 -06:00
LetterJay
8662e4a53c Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050 
[MIRROR] Mi-go
 2017-12-18 15:20:00 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
 2017-12-17 21:26:08 -06:00