shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,807 Commits 5 Branches 0 Tags
206e3185aabae56558bc22cf3dbdeff6498518d3
Commit Graph

464 Commits

Author SHA1 Message Date
CitadelStationBot
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -05:00
CitadelStationBot
6a2916a171 [MIRROR] Bluespace Launchpads (#879) 
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
 2017-05-18 07:12:13 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
ad65636014 [MIRROR] Fixes saying nothing when you have no language (#861) 
* Fixes saying nothing when you have no language

* fix .rej

* Update say.dm
 2017-05-18 06:12:39 -05:00
CitadelStationBot
f345d6a3ca [MIRROR] You can no longer bypass language restrictions with default language (#859) 
* You can no longer bypass language restrictions with default language

* resolve rej files

* Update language_menu.dm
 2017-05-18 05:05:19 -05:00
LetterJay
d40c2224c3 Merge pull request #624 from Citadel-Station-13/upstream-merge-26492 
[MIRROR] Adds new debug verb for highlighting roundstart ATs
 2017-05-18 05:51:54 -04:00
CitadelStationBot
ff9928fdd7 [MIRROR] Makes it clear whether (in)complete golem shells are free or servant (#857) 
* Makes it clear whether (in)complete golem shells are free or servant

* resolves rej file
 2017-05-18 04:40:12 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot
4f971be3a9 [MIRROR] Golems do not have underclothing (#784) 
* Golems do not have underclothing

* Resolves .rej

* Update golems.dm

* Update golems.dm
 2017-05-18 03:53:14 -05:00
CitadelStationBot
626959d96e [MIRROR] Fixes a bunch more cult bugs (#853) 
* Fixes a bunch more cult bugs

* Resolves .rejs and icons
 2017-05-18 03:21:07 -05:00
CitadelStationBot
47fa8353eb [MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710) 
* Moves playsound_local() to mob and gets rid of a useless proc.

* Fixes compile errors
 2017-05-18 01:39:16 -05:00
CitadelStationBot
ae5897cd82 Ash walkers speak Draconic by default, but still know common (#834) 2017-05-18 01:12:55 -05:00
CitadelStationBot
d2be6cfeb5 Refactors leather & Crafting with Bigenerator (#849) 2017-05-18 01:11:58 -05:00
Poojawa
4370b5285a Delete runes.dm.rej 2017-05-18 01:05:03 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
Poojawa
3dbbdc4476 Cryo icon state and Wizard tweaks (#975) 
* tweaks

* typing habits are bad.

* Update spellbook.dm

* Update rod_form.dm
 2017-05-17 23:36:50 -05:00
LetterJay
00b14017c0 ook ook language 2017-05-17 10:15:30 -05:00
LetterJay
5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952 2017-05-17 10:12:36 -05:00
LetterJay
d7c24de679 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26492 2017-05-17 09:58:53 -05:00
LetterJay
da2fc1da0d Merge pull request #990 from Citadel-Station-13/upstream-merge-27271 
[MIRROR] Refactors supply talismans to be less shitcode
 2017-05-17 10:51:02 -04:00
LetterJay
fe582cad7c Merge pull request #989 from Citadel-Station-13/upstream-merge-27214 
[MIRROR] Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
 2017-05-17 10:50:20 -04:00
LetterJay
c8a8f77be8 Merge pull request #1023 from Citadel-Station-13/upstream-merge-27333 
[MIRROR] Stops people from beating a dead horse (revenant)
 2017-05-17 10:45:38 -04:00
LetterJay
ce925fa04c Merge pull request #1024 from Citadel-Station-13/upstream-merge-27360 
[MIRROR] Prepends object names with 'The' in speech
 2017-05-17 10:45:04 -04:00
CitadelStationBot
242bff4288 Prepends object names with 'The' in speech 2017-05-17 05:13:47 -05:00
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
CitadelStationBot
bf3b6702c3 Stops people from beating a dead horse (revenant) 2017-05-17 05:03:31 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
46f5c4bb1b commit 2017-05-16 23:35:54 -05:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay
4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
CitadelStationBot
f52625b18c Refactors supply talismans to be less shitcode 2017-05-15 17:54:16 -05:00
CitadelStationBot
1f66249428 Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband 2017-05-15 17:04:23 -05:00
cebutris
fc628bcb89 adds the holoparasite box, and adds it to traitor uplinks (#913) 2017-05-14 20:36:22 -07:00
CitadelStationBot
040ac1236d [MIRROR] woops i forgot to check tick cannons fill proc. (#968) 
* woops i forgot to check tick cannons fill proc.

* Delete pneumaticCannon.dm.rej

* Update pneumaticCannon.dm
 2017-05-14 20:23:39 -07:00
CitadelStationBot
41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935) 
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons

* Delete gang.dm.rej
 2017-05-14 20:18:02 -07:00
CitadelStationBot
b95d4e0459 [MIRROR] Land Claim Flag (#951) 
* Land Claim Flag

* Delete charter.dm.rej

* Update charter.dm
 2017-05-14 20:16:17 -07:00
LetterJay
6c4a355379 Merge pull request #850 from Citadel-Station-13/upstream-merge-26980 
[MIRROR] Small Click refactor.
 2017-05-14 16:40:30 -04:00
LetterJay
c05c7334a5 Merge pull request #923 from Citadel-Station-13/upstream-merge-27151 
[MIRROR] Adds a visible message to teleport runes being teleported to
 2017-05-14 16:36:49 -04:00
LetterJay
051de8da99 Merge pull request #936 from Citadel-Station-13/upstream-merge-27184 
[MIRROR] Explosion flame_range now defaults to light range instead of zero
 2017-05-14 16:33:00 -04:00
LetterJay
bf26c247e0 Merge pull request #931 from Citadel-Station-13/upstream-merge-27167 
[MIRROR] Ports dakimakuras from HippieStation.
 2017-05-14 16:32:40 -04:00
LetterJay
42bb7a5ccd Merge pull request #941 from Citadel-Station-13/upstream-merge-27166 
[MIRROR] Fixes the recycler gibbing brainmobs
 2017-05-14 16:29:59 -04:00
LetterJay
1c422705d0 Merge pull request #950 from Citadel-Station-13/upstream-merge-27190 
[MIRROR] WHOSE FOOTPRINTS ARE THESE
 2017-05-14 16:28:05 -04:00
LetterJay
d64e569d6c Merge pull request #954 from Citadel-Station-13/upstream-merge-27199 
[MIRROR] Free Golems can purchase their own royal capes
 2017-05-14 16:27:25 -04:00
LetterJay
6ab7cfe9b9 Merge pull request #957 from Citadel-Station-13/upstream-merge-27215 
[MIRROR] Petting is better
 2017-05-14 16:27:08 -04:00
CitadelStationBot
5f603b7d85 Makes turrets less of a joke 2017-05-14 08:01:28 -05:00
CitadelStationBot
962d114339 Petting is better 2017-05-14 07:36:55 -05:00
LetterJay
4b72cc0486 Merge pull request #712 from Citadel-Station-13/upstream-merge-26760 
[MIRROR] Changes a bunch of hrefs to the proper defines
 2017-05-14 01:32:52 -04:00
LetterJay
00b17f1649 maybe 2017-05-14 00:28:07 -05:00
LetterJay
e36d24ee24 Merge pull request #739 from Citadel-Station-13/upstream-merge-26783 
[MIRROR] Mania Motors now do minor damage and continue to affect targets after they leave its range
 2017-05-14 01:12:34 -04:00