shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,311 Commits 5 Branches 0 Tags
d2d9cd7fc2a80bc7d4e4e8a7f4df2c5fdf5149e0
Commit Graph
458 Commits
Author SHA1 Message Date
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
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
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
jughuandCitadelStationBot d5472ab6e4 ha (#33391) 2017-12-10 13:03:30 -06:00
Tad HardestyandCitadelStationBot 41b0dbe36f Fix MULEbot id numbers showing nowhere but the alt-click menu (#33413) 2017-12-10 12:55:12 -06:00
TlaltecuhtliandCitadelStationBot 309f82dc9e commit (#33343) 
help what is this
 2017-12-08 10:34:42 -06:00
Ashe HiggsandCitadelStationBot 0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
ArmhulenandCitadelStationBot 45b9b4956c Fugu improvements (#33182) 
* come on, you know i wumbo you wumbo he she me wumbo

* it's hip to wumbo
 2017-12-06 06:32:50 -06:00
deathride58andGitHub 379f73d1e1 Merge branch 'master' into upstream-merge-32249 2017-12-04 23:15:38 +00:00
deathride58 21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
kevinz000andCitadelStationBot 66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
MoreRobustThanYouandCitadelStationBot 29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -06:00
deathride58andGitHub 4eceef7693 Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967 
[MIRROR] Added bot path data huds
 2017-11-30 04:34:25 +00:00
deathride58andGitHub 4ff2063a4a Update sloth.dm 2017-11-28 22:19:08 -05:00
Kyle Spier-SwensonandCitadelStationBot ad135a57a3 Makes the sloth an actual sloth 2017-11-28 19:02:45 -06:00
CruixandCitadelStationBot b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
vuonojenmustaturskaandCitadelStationBot f685f4bd1a Removes one source of decal/cleanable qdel failures (#33083) 
* remove one source of qdel memes

* pls

* A housekeeping thing for the ignore list, also removes effectively unused var

* whoops
 2017-11-27 05:30:08 -06:00
deathride58andGitHub 1d8618eaca Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090 
[MIRROR] Cleans up goldcore defines
 2017-11-27 03:11:42 +00:00
deathride58andGitHub d5eef89e13 Update parrot.dm 2017-11-26 21:26:35 -05:00
deathride58andGitHub 12cb0a98a4 Update headcrab.dm 2017-11-26 21:25:51 -05:00
deathride58andGitHub 90e13d0053 Update creature.dm 2017-11-26 21:25:13 -05:00
deathride58andGitHub e5e17cf334 Update bear.dm 2017-11-26 21:24:27 -05:00
deathride58andGitHub c67063beb5 Update lizard.dm 2017-11-26 21:23:50 -05:00
deathride58andGitHub e70daa585c Update fox.dm 2017-11-26 21:23:26 -05:00
deathride58andGitHub eb13f4ee2f Update farm_animals.dm 2017-11-26 21:22:42 -05:00
deathride58andGitHub 933b4a7a3a Update crab.dm 2017-11-26 21:21:55 -05:00
deathride58andGitHub 4e2db63a33 Update cat.dm 2017-11-26 21:21:28 -05:00
ShizCalevandCitadelStationBot 5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
ShizCalevandCitadelStationBot 4a22fed89d Cleans up goldcore defines 2017-11-26 16:51:44 -06:00
deathride58andGitHub 14ce7c8118 Merge pull request #4101 from Citadel-Station-13/upstream-merge-32994 
[MIRROR] Updates some item drops to use drop_location()
 2017-11-25 05:53:16 +00:00
deathride58andGitHub f92bc0c938 Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805 
[MIRROR] Refactor on_reagent_change to pass through the change type
 2017-11-24 23:47:13 +00:00
deathride58andGitHub 837779b683 Merge pull request #4109 from Citadel-Station-13/upstream-merge-33025 
[MIRROR] Fixes Lord Singuloth hungering for more than he should
 2017-11-24 23:15:09 +00:00
ArmhulenandCitadelStationBot a12a12b550 comma splice and ellipsis grammar fix (#33040) 
* :*)

* i think this fixes splice
 2017-11-24 15:21:11 -06:00
ShizCalevandCitadelStationBot 2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
ShizCalevandCitadelStationBot 12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
orangesandCitadelStationBot c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
deathride58andGitHub ad3608caeb Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699 
[MIRROR] Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
 2017-11-23 01:03:38 +00:00
LetterJayandGitHub eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188 
[MIRROR] JSON feedback
 2017-11-22 18:42:34 -06:00
deathride58andGitHub c97e8805f6 Update hostile.dm 2017-11-22 17:53:36 -05:00
GupGupandCitadelStationBot 8458dc952c Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale 2017-11-22 15:24:21 -06:00
orangesandCitadelStationBot cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
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 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58andGitHub eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00