shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,301 Commits 5 Branches 0 Tags
aedf16a76e1b4be57991def7f43daf96d4e6a86a
Commit Graph
663 Commits
Author SHA1 Message Date
deathride58andGitHub 1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58andGitHub 1dddcb5d83 Update beesease.dm 2017-11-20 22:28:29 -05:00
Jordan BrownandCitadelStationBot 2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58andGitHub 52514c118a Merge pull request #4025 from Citadel-Station-13/upstream-merge-32865 
[MIRROR] Lets you add examine text to component decals
 2017-11-20 05:08:10 +00:00
JordieandCitadelStationBot 2f8d8b8729 Merge pull request #32865 from ninjanomnom/decal-examine 
Lets you add examine text to component decals
 2017-11-19 22:36:01 -06:00
orangesandCitadelStationBot 808e11b414 Merge pull request #32852 from AutomaticFrenzy/patch/hud-fix 
Fix HUDs being over-added on Login and over-removed by silicons
 2017-11-19 15:16:42 -06:00
deathride58andGitHub eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00: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
orangesandCitadelStationBot a637da3b0f Add the ability to osay from the viewvar dropdown (#32804) 2017-11-17 03:49:08 -06:00
CitadelStationBotandkevinz000 43f49c74ee [MIRROR] adds 1 gbp to armhulen's account (grammar fix) (#3936) 
* adds 1 gbp to armhulen's account (grammar fix)

* Update mind.dm

* Update mind.dm
 2017-11-17 00:29:40 -08:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
orangesandCitadelStationBot 952fa2a0f2 Fix conflicts between helmet/mech HUDs and HUD glasses 2017-11-16 15:39:15 -06:00
deathride58andGitHub 0e0eb351b3 Merge pull request #3707 from Citadel-Station-13/upstream-merge-32221 
[MIRROR] Fixes allow_custom_shuttles default
 2017-11-16 17:34:22 +00: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 9849b9a13b Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482 
[MIRROR] Improves the deep fryer
 2017-11-15 11:13:56 -06:00
LetterJayandGitHub e7e060d83b Merge pull request #3946 from Citadel-Station-13/upstream-merge-32692 
[MIRROR] Adds some server tools info to getrev
 2017-11-15 10:41:25 -06:00
LetterJayandGitHub ce0ce0b6b9 Update changeling.dm 2017-11-15 10:38:57 -06:00
LetterJayandGitHub c725b0d30c Update machinery_sounds.dm 2017-11-15 10:25:34 -06:00
LetterJayandGitHub 1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
LetterJayandGitHub fb49013241 Merge branch 'master' into upstream-merge-32221 2017-11-14 15:59:47 -06:00
Jordan BrownandCitadelStationBot c6584399fe Adds some server tools info to getrev (#32692) 2017-11-14 15:36:45 -06:00
LetterJayandGitHub 9c7da6a133 Merge pull request #3905 from Citadel-Station-13/upstream-merge-32570 
[MIRROR] Checks for nulls in weakrefs
 2017-11-14 14:58:07 -06:00
LetterJayandGitHub ec2078d448 Update machinery_sounds.dm 2017-11-14 13:40:45 -06:00
LetterJayandGitHub e0d291eb19 Update weakrefs.dm 2017-11-14 13:06:53 -06:00
arsserpentariumandCitadelStationBot d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJayandGitHub 5591672deb Merge pull request #3915 from Citadel-Station-13/upstream-merge-32618 
[MIRROR] Fixes readapt removing hivemind communication.
 2017-11-13 11:52:48 -06:00
LetterJayandGitHub 304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
LetterJayandGitHub 083100a4df Merge branch 'master' into upstream-merge-32570 2017-11-13 11:45:39 -06:00
LetterJayandGitHub 9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582 
[MIRROR] Fixes 512 compile reminders
 2017-11-13 11:42:40 -06:00
LetterJayandGitHub 34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504 
[MIRROR] Weakrefs
 2017-11-13 11:41:38 -06:00
LetterJayandGitHub 3e55cec1b0 Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498 
[MIRROR] Fixes VV not displaying false values in keyed lists
 2017-11-13 11:41:18 -06:00
orangesandCitadelStationBot 51b0c286a9 Fixes readapt removing hivemind communication. 2017-11-13 03:20:50 -06:00
orangesandCitadelStationBot 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
Ashe HiggsandCitadelStationBot 9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -06:00
LetterJayandGitHub 7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJayandGitHub a62be6b939 Merge branch 'master' into upstream-merge-32498 2017-11-12 23:10:50 -06:00
LetterJayandGitHub 14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJayandGitHub 9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJayandGitHub b5051323aa Merge branch 'master' into upstream-merge-32221 2017-11-12 23:08:17 -06:00
kevinz000andCitadelStationBot 2180c4c1fe Checks for nulls in weakrefs 2017-11-12 18:00:02 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Emmett GainesandCitadelStationBot 95707bf1b7 fixes 512 compile reminders (#32582) 2017-11-11 14:33:22 -06:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJayandGitHub 6df47bed08 Update datumvars.dm 2017-11-09 03:15:20 -06:00
kevinz000andCitadelStationBot b44e31951d Weakrefs 2017-11-09 00:49:01 -06:00
Emmett GainesandCitadelStationBot 70d75c3988 fixes radioactive half life (#32511) 2017-11-09 00:45:40 -06:00
ACCountandCitadelStationBot becfcb1dd2 Fixes VV not displaying false values in keyed lists 2017-11-08 19:52:15 -06:00
LetterJayandGitHub 448326cd60 Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466 
[MIRROR] Fixes turf_decal layering
 2017-11-08 02:21:13 -06:00
ShizCalevandCitadelStationBot 88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00