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

62 Commits

Author SHA1 Message Date
deathride58
81e855d819 Update brain_damage_lines.json 2017-12-11 11:23:53 -05:00
Jordan Brown
1628a89402 Adds terry to brain damage lines 2017-12-11 08:57:22 -06:00
deathride58
65cc4a2f16 Merge pull request #4102 from Citadel-Station-13/upstream-merge-33001 
[MIRROR] Adds a python script to load jsons to prevent any syntax error on them
 2017-12-11 01:18:08 +00:00
deathride58
11b7094dfa fUCK - fixes compiling errors for real i hope fuck 2017-12-10 20:08:33 -05:00
deathride58
cb6c0e190d fixes compiling error 2017-12-10 19:48:40 -05:00
deathride58
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
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
Leo
0dc826735b Adds a python script to load jsons to prevent any syntax error on them (#33001) 
* Adds a python script to load jsons to prevent any syntax error on them

* Corrects identation on hallucination.json
 2017-11-24 12:59:41 -06:00
deathride58
de9cfb2b7c Update brain_damage_lines.json 2017-11-23 19:14:21 -05:00
Leo
67d495c053 Fixes strings runtime 2017-11-23 05:48:44 -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
The-clown-known-as-Pepe
212ef96a41 Minor ion law species update. (#32416) 
* GET THIS MERGED

* Update ion_laws.json
 2017-11-05 12:02:30 -06:00
ShizCalev
63d373729b removes old freon blob hint 2017-11-04 22:20:21 -05:00
oranges
f43c2b8db1 Updates the clockwork cult tips of the round 2017-11-01 21:37:35 -05:00
LetterJay
32f96de503 Update tips.txt 2017-10-29 14:48:04 -05:00
francinum
84f1d40da4 Removes outdated CC-Related tips 2017-10-25 23:43:28 -05:00
francinum
311de2f341 Removed an outdated tip referring to construction permits 2017-10-16 12:49:32 -05:00
Armhulen
c269b062b9 Mega Carp Re-Carpening: Carpatastrophe! 2017-10-12 00:29:21 -05:00
Raeschen
26c262542e Merge branch 'master' into master 2017-10-04 20:23:58 +01:00
Raeschen
48e5582d0a Attempt 2 at adding FTL's "Milky way" to lobby music roster 2017-10-04 20:20:09 +01:00
Armhulen
65a73bcefa Gives nightmares a random shadowling name (#31188) 
* fuck you ruined my !ONE COMMIT PR!

* !ONE COMMIT PR!
 2017-10-03 18:41:37 -05:00
oranges
183c158d14 Merge pull request #31106 from DaxDupont/puttheclownupsidedown 
Removes references to gangs from tips.txt
 2017-09-28 22:28:04 -05:00
CitadelStationBot
83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768) 
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
 2017-09-17 23:07:05 -05:00
Poojawa
8a723c664b OOOOGGG 2017-09-06 11:21:29 -05:00
Poojawa
1be71b61dc It's a good version (#2621) 2017-09-06 07:05:51 -05:00
LetterJay
92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
kevinz000
f7d9c456d7 kek 2017-08-29 10:08:24 -07:00
CitadelStationBot
d3504f2e7b Add a brain damage line from a backstory 2017-08-23 15:46:50 -05:00
LetterJay
88e9937425 Merge pull request #2316 from Citadel-Station-13/upstream-merge-29758 
[MIRROR] updates brain damage lines
 2017-08-14 19:37:50 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
f8329e2a89 Update brain_damage_lines.json 2017-08-14 09:17:25 -05:00
CitadelStationBot
514ebfe21b updates brain damage lines 2017-08-08 22:36:27 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
8ca4b9d614 Clockcult Combat Rebalance + Conversion Rework (#2020) 
* Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures

* Update tips.txt

* no one cares

* manual clockcult syn
 2017-08-04 11:46:22 -07:00
CitadelStationBot
8a4ddbe8a8 [MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162) 
* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else
 2017-08-02 04:56:44 -05:00
LetterJay
77c67b31c6 Merge pull request #2064 from Citadel-Station-13/upstream-merge-29290 
[MIRROR] Unwrenching clockwork structures no longer damages them
 2017-07-30 23:14:39 -05:00
CitadelStationBot
79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
Raeschen
71bcd2e0f8 Added "Goodbye moonmen" to lobby music selection 2017-07-26 13:10:20 +01:00
CitadelStationBot
62c93c3774 Adds more CAS cards. Removes a couple shit ones. 2017-07-24 21:14:35 -05:00
LetterJay
45de96b542 Update tips.txt 2017-07-19 13:43:38 -05:00
CitadelStationBot
88bef4f0c0 Unwrenching clockwork structures no longer damages them 2017-07-18 09:47:52 -05:00
CitadelStationBot
9874978c5c Dreams while sleeping are now slightly longer on average and will contain more possibilities (#1940) 2017-07-07 23:48:49 -07:00
CitadelStationBot
6b784739ab Adds stungloves to tgstation (#1469) 2017-06-17 13:31:19 -07:00
CitadelStationBot
97005222ff Blood Cult Nerf: Restricted Nar-Sie summoning locations (#1479) 2017-06-13 13:48:49 -07:00
kevinz000
ce7b714ada Merge pull request #730 from Citadel-Station-13/upstream-merge-26862 
[MIRROR] If you're gonna rename a job, do it right!
 2017-05-07 23:16:21 -07:00
CitadelStationBot
ee99534085 If you're gonna rename a job, do it right! 2017-05-03 22:21:50 -05:00
CitadelStationBot
529125d3dd Moves tips from config to strings tree 2017-05-01 11:51:27 -05:00
CitadelStationBot
d696954cd5 Moves config/names to strings/names 2017-04-29 19:49:29 -05:00
Poojawa
7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00