shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,227 Commits 5 Branches 0 Tags
43faadce158a10bcb2a4a878e232ae9bbf383712
Commit Graph
249 Commits
Author SHA1 Message Date
JordieandCitadelStationBot 5bb8a1b962 Merge pull request #32853 from KorPhaeron/purple 
Fixes purple bartender clothes
 2017-11-19 22:55:03 -06:00
CitadelStationBotandkevinz000 0beef30fb7 Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993) 2017-11-17 19:02:40 -08:00
orangesandCitadelStationBot 952fa2a0f2 Fix conflicts between helmet/mech HUDs and HUD glasses 2017-11-16 15:39:15 -06:00
LetterJayandGitHub 1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -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
LetterJayandGitHub 14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LeoandCitadelStationBot 64d0c4711f Merge pull request #32583 from Iamgoofball/patch-334 
Frog masks no longer have a sound
 2017-11-11 14:31:37 -06:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJayandGitHub ea44e4a1d9 Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489 
[MIRROR] Global vest lists
 2017-11-08 02:21:36 -06:00
ShizCalevandCitadelStationBot 5f5f313551 Global vest lists (#32489) 
* Global vest lists

* revised coat

* Fixed duped proc
 2017-11-07 23:57:57 -06:00
kevinz000andCitadelStationBot 3253087a0d Makes flightsuits far more vulnerable to EMPs (#32430) 2017-11-07 10:39:42 -06:00
LetterJayandGitHub 0ca35e765d Merge pull request #3842 from Citadel-Station-13/upstream-merge-32456 
[MIRROR] [s] Removes a handful of ways ghosts can affect the world
 2017-11-07 04:44:08 -06:00
orangesandCitadelStationBot 1068b8f22d Merge pull request #32456 from vuonojenmustaturska/ghostmemes 
[s] Removes a handful of ways ghosts can affect the world
 2017-11-06 21:48:42 -06:00
AnturKandCitadelStationBot 2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
Jordan BrownandCitadelStationBot d905c9500d Merge pull request #32418 from KorPhaeron/cloak 
Updates cape descriptions
 2017-11-05 12:03:50 -06:00
MercenaryblueandCitadelStationBot a1532818bc Frog masks [Feature] [ready] 2017-11-04 15:17:31 -05:00
kevinz000andCitadelStationBot f7c5196954 nerf flight vision (#32312) 2017-11-02 04:08:51 -05:00
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJayandGitHub 74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJayandGitHub 0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJay 79d6f42dfd conflicts 2017-10-28 01:16:26 -05:00
Emmett GainesandCitadelStationBot ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
LetterJayandGitHub 20bbd77f73 Merge pull request #3549 from Citadel-Station-13/upstream-merge-31974 
[MIRROR] Biosuits now offer high Rad resistance
 2017-10-23 03:44:18 -04:00
RobustinandCitadelStationBot 04b3a18502 Biosuits now offer high Rad resistance (#31974) 
* Biosuit rad resistance buff

* Buffed medical hardsuit rad resist
 2017-10-21 23:16:18 -05:00
Jordan BrownandCitadelStationBot d0789ecaf9 Splits clothing.dm in 7 other files 2017-10-21 19:01:30 -05:00
PoojawaandGitHub 62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -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
Emmett GainesandCitadelStationBot 28f3bc0918 Adds radiation goggles and a small rewrite to make adding more view modes in the future easier (#31751) 
* adds radiation goggles

* cleanup
 2017-10-19 02:54:23 -05:00
Jordan BrownandCitadelStationBot f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
Jordan BrownandCitadelStationBot 742669cc62 Restores security bombsuit & white bombsuit 2017-10-15 11:33:42 -05:00
LetterJayandGitHub 253f1e3f1c Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570 
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
 2017-10-14 15:37:17 -04:00
LetterJayandGitHub 45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601 
[MIRROR] Fix many instances of "the the"
 2017-10-14 15:37:00 -04:00
LetterJayandGitHub c056349055 Update flightsuit.dm 2017-10-14 13:57:22 -05:00
LetterJayandGitHub 49ffb814d5 Update flightsuit.dm 2017-10-14 09:23:01 -05:00
LetterJayandGitHub 5bbf3b9735 Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620 
[MIRROR] Fixes various Nanotrasen capitalizations
 2017-10-14 10:19:15 -04:00
LetterJayandGitHub d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
kevinz000andCitadelStationBot 77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
francinumandCitadelStationBot f63adc1931 Fixes various Nanotrasen capitalizations (#31620) 
* Fixes capitalization of Nanotrasen for secsuits

gimme the GBP

* Fixes this one too
 2017-10-13 12:13:26 -05: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
AnturKandCitadelStationBot 5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
LetterJayandGitHub a1d4868601 Merge pull request #3270 from Citadel-Station-13/upstream-merge-31437 
[MIRROR] Makes the santa event properly poll ghosts
 2017-10-10 05:54:44 -04:00
MoreRobustThanYouandCitadelStationBot b05a4ebb29 Makes the santa event properly poll ghosts (#31437) 
* Makes the santa event properly poll ghosts

* Update xmas.dm

* Update xmas.dm

* Create event.dm

* Update tgstation.dme

* Update xmas.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm
 2017-10-10 03:16:23 -05:00
Tad HardestyandCitadelStationBot 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJayandGitHub 3232f0a2a0 Update flightsuit.dm 2017-10-09 21:27:59 -05:00
XDTMandCitadelStationBot 7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJayandGitHub a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386 
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
 2017-10-08 16:18:18 -04:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00