shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,416 Commits 5 Branches 0 Tags
abb8fc2627fb1dfd2d5dc0cdba78468f63b157de
Commit Graph
343 Commits
Author SHA1 Message Date
deathride58 70a2c466f3 manual mirror of upstream robotic surgery pr 2017-10-25 14:29:45 -04:00
Michiyamenotehifunana 54a51a2fdb NEB Polishing 
Toys now implemented in a better way, new sound effects, and new traitor variant.
 2017-10-25 16:36:03 +08:00
kevinz000andCitadelStationBot f4e0eab993 fixes AIs being able to teleport the id card console inserted cards to their core (#32003) 
* Update card.dm

* Update card.dm
 2017-10-23 08:59:24 -05:00
LetterJayandGitHub b7fa4410ce Update communications.dm 2017-10-22 10:46:32 -05:00
CitadelStationBotandPoojawa d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
KorPhaeronandCitadelStationBot e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
orangesandCitadelStationBot b439b96865 Comms console tweak 2017-10-19 03:52:52 -05:00
Emmett GainesandCitadelStationBot 04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
Jordan BrownandCitadelStationBot 5bb7618aa9 Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers 
ID ejecting from computers by alt-clicking
 2017-10-14 18:48:13 -05:00
LetterJayandGitHub d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
Jordan BrownandCitadelStationBot bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett GainesandCitadelStationBot 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
ShizCalevandCitadelStationBot d9c77f628d Fixes gen scanner timer 2017-10-01 17:03:52 -05:00
LetterJayandGitHub f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJayandGitHub 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJayandGitHub 9e48311632 Update cloning.dm 2017-09-30 14:27:04 -05:00
LetterJayandGitHub 07c95ef168 Update aifixer.dm 2017-09-30 14:26:41 -05:00
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
vuonojenmustaturskaandCitadelStationBot 98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
LetterJayandGitHub 7df3c80a39 Update cloning.dm 2017-09-29 23:41:44 -05:00
Jordan BrownandCitadelStationBot e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
KorPhaeronandCitadelStationBot 6fca708b33 Advanced camera consoles use a list for z lock rather than a single z level (#30661) 
* Refactor Abductor Console

* Station lock
 2017-09-28 10:44:12 -05:00
LetterJayandGitHub 1ea098b805 Update pod.dm 2017-09-27 19:10:48 -05:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
ShizCalevandCitadelStationBot 169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
CitadelStationBotandPoojawa 2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857) 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
 2017-09-22 23:35:22 -05:00
CitadelStationBotandPoojawa 7299854f8b [MIRROR] Puts the computer circuit board back in nullspace where it supposedly belongs (#2810) 
* Puts the computer circuit board back in nullspace where it supposedly belongs

* Update _computer.dm
 2017-09-17 22:55:04 -05:00
PoojawaandGitHub 71719f6787 Update _computer.dm 2017-09-16 09:19:47 -05:00
CitadelStationBotandPoojawa 7d34286803 [MIRROR] Fixes a bunch of computers (#2766) 
* Fixes a bunch of computers (#30693)

* Fixes a bunch of computers
 2017-09-14 13:23:01 -05:00
CitadelStationBotandPoojawa 099b6628fa [MIRROR] Full jobs will no longer be shown as priority for latejoiners (#2729) 
* Full jobs will no longer be shown as priority for latejoiners

* Update card.dm
 2017-09-13 22:54:41 -05:00
CitadelStationBotandPoojawa 34edb1b5e4 [MIRROR] Fixes the Orion Trail machine (#2703) 
* Fixes the Orion Trail machine

* Update arcade.dm
 2017-09-13 18:08:18 -05:00
CitadelStationBotandPoojawa 9d52a495b2 [MIRROR] Fix monastery shuttle + Pods (#2599) 
* Fix monastery shuttle + Pods

* actually ports podfix
 2017-09-13 17:58:25 -05:00
CitadelStationBotandPoojawa 083fc1a7b4 [MIRROR] Standardized power displays (#2539) 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
 2017-09-13 17:57:16 -05:00
LetterJayandGitHub cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJayandGitHub a549f3128a Update atmos_control.dm 2017-09-12 03:02:15 -05:00
LetterJayandGitHub deca859284 Update atmos_alert.dm 2017-09-12 03:00:11 -05:00
LetterJayandGitHub 505925d767 Update atmos_alert.dm 2017-09-12 02:59:58 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
vuonojenmustaturskaandCitadelStationBot 053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
orangesandCitadelStationBot 25a5325e24 Merge pull request #30489 from Cyberboss/CompLightFix 
Makes computers lose their light when their screens break
 2017-09-08 21:01:39 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay 6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot 94400c4d38 Allows disabling shuttle purchases per map. 2017-08-26 11:08:12 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00