shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,905 Commits 5 Branches 0 Tags
13ebff97df7f94ffb0f386dccebb68bc3c8b4fbe
Commit Graph

159 Commits

Author SHA1 Message Date
ike709
a23935c037 Directional computer sprites (#32656) 
Technically I did fix it. It just wasn't a good fix. That's a good description of most of my coding.
 2017-11-14 05:01:09 -06:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
LetterJay
81d1abe64e Update message.dm 2017-11-12 08:09:12 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
7b791899b2 Update robot.dm 2017-11-11 15:54:57 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJay
31e2303e39 Merge pull request #3500 from Citadel-Station-13/upstream-merge-31849 
[MIRROR] Comms console tweak
 2017-10-31 07:58:15 -04:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
d182acae7f Merge pull request #3659 from Citadel-Station-13/upstream-merge-31723 
[MIRROR] Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds
 2017-10-29 04:22:03 -04:00
LetterJay
2503a90dc0 Merge pull request #3585 from Michiyamenotehifunana/CX-sword 
Adds fancy Energy Swords (and a toy version)
 2017-10-29 03:56:27 -04:00
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
Ashe Higgs
37bb75a645 Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds (#31723) 
* Cleans up clockcult code a little

* Another thing with servants_active

* Now it compiles
 2017-10-27 17:36:31 -05:00
KorPhaeron
ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
LetterJay
f5cb95ecd6 Update communications.dm 2017-10-25 16:19:03 -05:00
LetterJay
a027526ba4 Merge branch 'master' into upstream-merge-31849 2017-10-25 16:55:39 -04:00
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
kevinz000
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
LetterJay
b7fa4410ce Update communications.dm 2017-10-22 10:46:32 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
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
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
oranges
b439b96865 Comms console tweak 2017-10-19 03:52:52 -05:00
Emmett Gaines
04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
Jordan Brown
5bb7618aa9 Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers 
ID ejecting from computers by alt-clicking
 2017-10-14 18:48:13 -05:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
ShizCalev
d9c77f628d Fixes gen scanner timer 2017-10-01 17:03:52 -05:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay
9e48311632 Update cloning.dm 2017-09-30 14:27:04 -05:00
LetterJay
07c95ef168 Update aifixer.dm 2017-09-30 14:26:41 -05:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
vuonojenmustaturska
98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
LetterJay
7df3c80a39 Update cloning.dm 2017-09-29 23:41:44 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
KorPhaeron
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
LetterJay
1ea098b805 Update pod.dm 2017-09-27 19:10:48 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
CitadelStationBot
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
CitadelStationBot
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
Poojawa
71719f6787 Update _computer.dm 2017-09-16 09:19:47 -05:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
34edb1b5e4 [MIRROR] Fixes the Orion Trail machine (#2703) 
* Fixes the Orion Trail machine

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

* actually ports podfix
 2017-09-13 17:58:25 -05:00