shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,090 Commits 5 Branches 0 Tags
f358cc8649f3f554cc80648524fca54c8ea3eafa
Commit Graph

64 Commits

Author SHA1 Message Date
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay
a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot
9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
LetterJay
e1e60417f2 Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884 
[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
 2017-06-14 08:49:01 -05:00
CitadelStationBot
33eb60747f Refactored advanced camera consoles (#1576) 2017-06-13 13:39:47 -07:00
LetterJay
46f4472bca Merge pull request #1507 from Citadel-Station-13/upstream-merge-28207 
[MIRROR] Medical record summaries are now single inputs as well
 2017-06-12 12:38:41 -05:00
CitadelStationBot
7658deae09 Fixes communications consoles 2017-06-09 20:08:42 -05:00
CitadelStationBot
9198b10fd3 Medical record summaries are now single inputs as well 2017-06-09 09:29:47 -05:00
CitadelStationBot
e034a6be50 Security record crime details is now a single line input box 2017-06-08 19:08:53 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot
7ec36019d5 Refactor another spawned cooldown var (#1383) 2017-06-04 09:07:49 -07:00
CitadelStationBot
1e12557776 Remove spawns in favour of stacktrace calls, which don't stop the called (#1382) 2017-06-04 09:06:27 -07:00
LetterJay
976c1244dd Config shit for cards (#1310) 2017-06-02 21:56:08 -07:00
CitadelStationBot
96eb21fa2a CereStation Security Department Revamp (and other misc fixes/changes) 2017-05-31 19:57:52 -05:00
LetterJay
976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
CitadelStationBot
fa42d8631a Comm Console Fix 2017-05-27 23:27:19 -05:00
LetterJay
ef018fb14d Merge pull request #1182 from Citadel-Station-13/upstream-merge-27627 
[MIRROR] Xenobio console origin tech fix
 2017-05-26 23:24:08 -05:00
CitadelStationBot
fa4e0e61d6 Fixes adv camera leaving obscured images 2017-05-26 09:05:52 -05:00
CitadelStationBot
e2b1ef2ad2 Xenobio console origin tech fix 2017-05-25 09:44:40 -05:00
LetterJay
869953cd18 Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503 
[MIRROR] Changes investigate logs to use a define
 2017-05-24 12:34:36 -05:00
CitadelStationBot
3651637cd8 Fixes advanced cam not cleaning up properly 2017-05-23 13:44:19 -05:00
CitadelStationBot
e02290bf2b Replaced mob spawner vars with outfits 2017-05-23 07:57:42 -05:00
CitadelStationBot
01cd2039e5 Changes investigate logs to use a define 2017-05-22 22:45:54 -05:00
CitadelStationBot
5956761df8 Adds a new toy to arcade prizes. A rumbling toy toolbox meant to mimic hisgrace 2017-05-18 16:36:43 -05:00
CitadelStationBot
33941c29c8 [MIRROR] People can be cloned from heads or brains (#919) 
* People can be cloned from heads or brains

* .rej fixes

* Update cloning.dm
 2017-05-18 09:49:26 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
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
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
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
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay
22aef374e2 Merge branch 'master' into upstream-merge-26140 2017-05-13 01:28:34 -04:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
CitadelStationBot
4140cffc98 Nuke op TC consoles can donate all TCs at once, and other small changes. 2017-05-04 18:08:14 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
LetterJay
8af590f075 Merge pull request #591 from Citadel-Station-13/upstream-merge-26601 
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
 2017-05-02 11:10:13 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot
cc0a9b87fb Changes /obj/machinery to have atom/movable occupants 2017-05-01 15:58:52 -05:00
CitadelStationBot
b2a5a9fad5 Message monitor fix + spawn kill 2017-04-30 11:22:17 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
27feafc699 Changes all instances of "RD Console" to "R&D Console" 2017-04-27 03:00:07 -05:00
CitadelStationBot
b45d053ac6 When jumpsuits take severe damage, their suit sensors break. 2017-04-27 02:32:35 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
a905c15dad Replaces /image with /mutable_appearance (#556) 
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
 2017-04-26 08:18:35 -05:00
CitadelStationBot
b61ac211a4 Fixes Orion Trail (#417) 2017-04-16 11:41:06 -04:00
Poojawa
9e72b1b8fd /tg/ 4/14 (#367) 
* outside code stuff

* defines, helpers, etc

* everything not module

* modules

* compiled fixes + missing sounds
 2017-04-14 23:28:04 -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
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303) 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
 2017-03-21 11:44:10 -05:00