shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph
5768 Commits
Author SHA1 Message Date
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
duncathan saltandCitadelStationBot 0f2fd05e87 removes silly garbage defines 2017-12-19 08:02:18 -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 8fef308d0a Update living_defense.dm 2017-12-18 17:27:04 -06:00
LetterJayandGitHub 64f003d3b1 Update living.dm 2017-12-18 17:26:25 -06:00
LetterJayandGitHub 0d137f82d4 Update life.dm 2017-12-18 17:26:10 -06:00
LetterJayandGitHub 8b56d1ccdd Update combat.dm 2017-12-18 17:26:01 -06:00
LetterJayandGitHub 078c8744e0 Update species.dm 2017-12-18 17:25:47 -06:00
LetterJayandGitHub e4d6f4110f Update human_defense.dm 2017-12-18 17:25:33 -06:00
LetterJayandGitHub 10eaeed06b Update carbon.dm 2017-12-18 17:25:09 -06:00
XDTMandCitadelStationBot 13dd125e28 [HIGH PRIORITY]Hotfix for the monkeylike disability 2017-12-18 16:11:27 -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
XDTMandCitadelStationBot 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJayandGitHub 8fde63e016 Update simple_animal.dm 2017-12-18 15:15:34 -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
vuonojenmustaturskaandCitadelStationBot 8cbad06f35 Advanced mob laziness 2017-12-17 19:36:04 -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
MoreRobustThanYouandCitadelStationBot 2f8d49de91 [READY] Monkey mode overhaul 2017-12-15 18:35:52 -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