shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,653 Commits 5 Branches 0 Tags
2eaae2eb14bfc4c6ca22ed53c6ff7da106a9e2a9
Commit Graph
1212 Commits
Author SHA1 Message Date
MatthewandGitHub 529e839203 dog borgs module icon fix 2017-12-21 13:46:44 -06:00
LetterJayandGitHub d66b64b1f1 Merge pull request #4466 from Michiyamenotehifunana/xeno-nerf 
Removes pierce immunity from roundstart xenos
 2017-12-21 04:59:00 -06:00
LetterJayandGitHub 3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJayandGitHub 56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
Michiyamenotehifunana 2be1b5eb29 Removes pierce immunity from roundstart xenos 2017-12-20 23:05:05 +08:00
ShizCalevandCitadelStationBot b83dd93309 lizard stuff (#33669) 2017-12-20 05:55:45 -06:00
LetterJayandGitHub 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Jordan BrownandCitadelStationBot 25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
ACCountandCitadelStationBot 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
XDTMandCitadelStationBot 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 8662e4a53c Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050 
[MIRROR] Mi-go
 2017-12-18 15:20:00 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 6aa1a86f88 Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529 
[MIRROR] Removed drone light in favor of night vision
 2017-12-17 20:37:39 -06:00
LetterJayandGitHub 3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
coiaxandCitadelStationBot e93bb49994 Spinning resin or laying eggs on vents prompts the user if they're sure (#33302) 
add: Aliens (and humans with alien organs) are unable to create resin
structures or lay eggs atop vents or scrubbers.

This stops stupid aliens from obscuring entrances to the very helpful
and useful atmospheric piping system.
 2017-12-17 19:27:45 -06:00
LetterJayandGitHub 1c380e3ed4 Update verbs.dm 2017-12-17 17:50:05 -06:00
XDTMandCitadelStationBot 962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
Emmett GainesandCitadelStationBot f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
RobustinandCitadelStationBot be6a0e82ff Slightly faster, more stunnable (#33568) 2017-12-17 04:11:32 -06:00
vuonojenmustaturskaandCitadelStationBot 3fc98677a0 Fixes a brain login runtime (#33569) 
* Fixes a silly brain meme

* better
 2017-12-17 04:11:17 -06:00
ArmhulenandCitadelStationBot 8a0aa32335 Mi-go 2017-12-17 04:11:01 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
deathride58andkevinz000 b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
kevinz000 253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Trevor SerpasandCitadelStationBot f7a943575d Removed drone light in favor of night vision 2017-12-15 03:26:35 -06:00
deathride58andGitHub d2d9cd7fc2 Update logout.dm 2017-12-14 19:12:27 -05:00
vuonojenmustaturskaandCitadelStationBot c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
Ashe HiggsandCitadelStationBot 2aef00daf0 All-In-One grinder results are now defined by type, not by huge lists 2017-12-14 15:48:39 -06:00
vuonojenmustaturskaandCitadelStationBot fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
deathride58andGitHub 7ca4a29cac Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465 
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
 2017-12-14 03:54:31 +00:00
deathride58andGitHub fb492b5a14 Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494 
[MIRROR] Fixes two unrelated runtimes
 2017-12-14 03:54:08 +00:00
LeoandCitadelStationBot 51cce087d8 Fixes two unrelated runtimes 2017-12-13 14:12:26 -06:00
vuonojenmustaturskaandCitadelStationBot 7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Jordan BrownandCitadelStationBot 129cd705d1 Correctly set description of nonstandard cells 2017-12-13 09:12:55 -06:00
deathride58 5535509a65 fixes broken metabolism 2017-12-12 15:15:22 -05:00
CitadelStationBotandkevinz000 cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturKandCitadelStationBot 6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
LetterJayandGitHub 85578cae0d Merge pull request #4316 from deathride58/iconoverridefix 
Fixes icon_override only applying to uniforms
 2017-12-10 17:15:13 -06:00
deathride58andGitHub 216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
 2017-12-10 22:43:58 +00:00
deathride58andGitHub 94d0293703 Merge pull request #4305 from Citadel-Station-13/upstream-merge-33413 
[MIRROR] Fix MULEbot ID numbers showing nowhere but the alt-click menu
 2017-12-10 22:39:02 +00:00
deathride58andGitHub fd3b0c72de Update say.dm 2017-12-10 17:01:50 -05:00
deathride58andGitHub 7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
deathride58 85ccdac4d7 fixes icon_override only applying to uniforms 2017-12-10 16:37:28 -05:00
jughuandCitadelStationBot d5472ab6e4 ha (#33391) 2017-12-10 13:03:30 -06:00