shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,340 Commits 5 Branches 0 Tags
5e43516925939b4d6bbdda6a340d079743ed2700
Commit Graph
1082 Commits
Author SHA1 Message Date
Tad HardestyandCitadelStationBot 38c45fb479 Refactor chasm paths to be more sane (#32701) 
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
 2017-11-22 03:30:49 -06:00
deathride58andGitHub 0f9a85e4d7 Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101 
[MIRROR] Refactor of catpeople mutant organs
 2017-11-21 21:16:31 +00:00
deathride58andGitHub 15165d970d Update inventory.dm 2017-11-20 22:29:55 -05:00
deathride58andGitHub 3aefa4a907 Update cameranet.dm 2017-11-20 22:29:15 -05:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
checkraisefoldandCitadelStationBot e3036f6eae fix 'cannot scream while unconscious' bug (#32814) 
* fix 'cannot scream while unconscious' bug 

fixes a bug where it tells you that you can't scream while unconscious while on fire (experienced on Bagil when a plasma fire happened at endround shuttle)

* Update species.dm

* sanitize code

* add the comment back so people know what it doin

* change operator

other one wouldn't work with the fix, the screaming is supposed to happen while you're in crit
 2017-11-18 13:52:36 -06:00
deathride58andGitHub 9e78bcd8f9 Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786 
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
 2017-11-18 05:29:32 +00:00
deathride58andGitHub d202867730 Update carbon.dm 2017-11-17 23:23:13 -05:00
deathride58andGitHub f1818eb11b Update death.dm 2017-11-17 23:22:02 -05:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
orangesandCitadelStationBot 2099954f7a Merge pull request #32744 from JJRcop/last_res--oh 
Fixes changeling egg when slug destroyed
 2017-11-16 15:35:56 -06:00
deathride58andGitHub 805eaedd5a Update lizardpeople.dm 2017-11-16 12:42:38 -05:00
deathride58andGitHub a488e7cf07 Update lizardpeople.dm 2017-11-16 12:38:11 -05:00
LetterJayandGitHub 286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183 
[MIRROR] Ling datum antag standarization.
 2017-11-15 15:00:46 -06:00
LetterJayandGitHub 2715fd1b6c Merge pull request #3950 from deathride58/slimernosliming 
Re-disables slimeperson splitting
 2017-11-15 10:54:51 -06:00
LetterJayandGitHub 163ef812fb Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702 
[MIRROR] Minor speedups to movement: First Blood Part 2
 2017-11-15 10:41:16 -06:00
LetterJayandGitHub 46ba6cbc7b Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620 
[MIRROR] Greatly increases the performance of station-ending plasma fires
 2017-11-15 10:40:40 -06:00
LetterJayandGitHub 3c28ea5426 Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277 
[MIRROR] Removes golem debug code that spams world
 2017-11-15 10:30:31 -06:00
LetterJayandGitHub 1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
deathride58 f1274b41f2 redisables slime splitting 2017-11-14 19:27:19 -05:00
LetterJayandGitHub 809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176 
[MIRROR] loc -- > forcemove
 2017-11-14 15:58:20 -06:00
vuonojenmustaturskaandCitadelStationBot 8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
vuonojenmustaturskaandCitadelStationBot 157998e974 Greatly increases the performance of station-ending plasma fires 2017-11-14 13:51:45 -06:00
RobustinandCitadelStationBot 2fc1e5c8e5 More nuanced damage examination (#32707) 
* More nuanced damage examinations

* Tweaking examination values

* Redundancy Removal
 2017-11-14 13:48:20 -06:00
LetterJayandGitHub d983c7d928 Update examine.dm 2017-11-13 11:54:18 -06:00
LetterJayandGitHub f46db62f48 Update examine.dm 2017-11-13 11:49:47 -06:00
LetterJayandGitHub 14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJayandGitHub 3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
LetterJayandGitHub e97bc1028e Update examine.dm 2017-11-12 14:09:20 -06:00
LetterJayandGitHub 8d78a999e1 Update jellypeople.dm 2017-11-12 13:17:41 -06:00
LetterJayandGitHub 6da7d8e8b5 Update posibrain.dm 2017-11-12 13:17:08 -06:00
kevinz000andCitadelStationBot 80a06368bf Fixes Colossus Projectiles (#32621) 2017-11-12 01:27:20 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Dax DupontandCitadelStationBot 83c40d5fcc Fixes medbots not injecting from one tile away 2017-11-11 14:31:29 -06:00
LetterJayandGitHub fc04d94a29 Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530 
[MIRROR] Makes editing movements delay configs have an effect again
 2017-11-11 12:37:59 -06:00
LetterJayandGitHub 9071fde91b Merge pull request #3860 from Citadel-Station-13/upstream-merge-32515 
[MIRROR] Process_Spacemove proc improvement
 2017-11-11 12:36:35 -06:00
Jordan BrownandCitadelStationBot 248d63fa3a Makes editing movements delay configs have an effect again (#32530) 2017-11-09 11:06:03 -06:00
LetterJayandGitHub d6e5942baf Merge branch 'master' into upstream-merge-31176 2017-11-09 03:24:38 -06:00
LetterJayandGitHub e73fbd0a8e Update pirate.dm 2017-11-09 03:15:01 -06:00
LetterJayandGitHub 1808943097 Update faithless.dm 2017-11-09 03:14:53 -06:00
Blute1andCitadelStationBot e6031b0d5c Process_Spacemove proc improvement 2017-11-08 19:51:57 -06:00
LeoandCitadelStationBot b48e8da861 Merge pull request #32442 from KorPhaeron/flyingrevert 
Reverts flying mobs passing through people
 2017-11-07 08:04:43 -06:00
LetterJayandGitHub 787994ca3c Merge pull request #3840 from Citadel-Station-13/upstream-merge-32437 
[MIRROR] Adds an organ storage bag to the syndicate medborg
 2017-11-07 04:46:44 -06:00
AnonmareandCitadelStationBot 9c12ee48e1 Adds an organ storage bag to the syndicate medborg (#32437) 
* Adds an organ storage bag to the syndicate medborg

* Adds the drill and extinguisher
 2017-11-06 15:15:10 -06:00
MoreRobustThanYouandCitadelStationBot 1b1411f41f Monkeys can no longer transmit diseases through hardsuits (#32431) 2017-11-05 20:45:34 -06:00
AnturKandCitadelStationBot 2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
LetterJayandGitHub 39692c6134 Merge pull request #3790 from Citadel-Station-13/upstream-merge-32354 
[MIRROR] Woody golems get woody names.
 2017-11-04 22:47:34 -05:00
LetterJayandGitHub dd32227946 Merge pull request #3786 from Citadel-Station-13/upstream-merge-32346 
[MIRROR] removes lesser drake crusher loot
 2017-11-04 22:45:17 -05:00
ArmhulenandCitadelStationBot 056594114f Woody golems get woody names. (#32354) 
* ya, that'll do em.

* we all make mistakes

* heat signature is a great game

* it's aliiiiive

* caving: the commit
 2017-11-03 17:01:24 -05:00
imsxzandCitadelStationBot a509a99b52 crusher loot fix (#32346) 2017-11-03 15:54:44 -05:00