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

1890 Commits

Author SHA1 Message Date
kevinz000
d9908a74a7 Merge pull request #748 from Citadel-Station-13/upstream-merge-26808 
[MIRROR] Adds aesthetic basalt floor tiles
 2017-05-07 06:24:50 -07:00
kevinz000
035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848 
[MIRROR] Adds spewium toxin in traitor kits
 2017-05-06 21:43:08 -07:00
kevinz000
c8dbcb8597 Merge pull request #754 from Citadel-Station-13/upstream-merge-26863 
[MIRROR] Fixes dropped cyborg repair modules
 2017-05-06 21:30:12 -07:00
kevinz000
329190d660 Merge pull request #809 from Citadel-Station-13/upstream-merge-26933 
[MIRROR] Makes medbay vending machines buildable
 2017-05-06 14:22:08 -07:00
kevinz000
638250993c Merge pull request #770 from Citadel-Station-13/upstream-merge-26873 
[MIRROR] Fixes grammar error on spawner grenades
 2017-05-06 14:11:18 -07:00
CitadelStationBot
30f7e170a3 Makes medbay vending machines buildable 2017-05-06 13:52:12 -05:00
CitadelStationBot
5de94c22e7 Fixes grammar error on spawner grenades 2017-05-04 20:25:46 -05:00
CitadelStationBot
46d7976488 Adds spewium toxin in traitor kits 2017-05-04 17:53:42 -05:00
CitadelStationBot
34bf3e4113 Fixes dropped cyborg repair modules 2017-05-04 17:50:32 -05:00
CitadelStationBot
da781e0d76 Adds aesthetic basalt floor tiles 2017-05-04 06:12:26 -05:00
CitadelStationBot
7c56c058b3 Adds examining mouths with flashlights 2017-05-04 06:11:22 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -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
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
7c02c0ef6a Merge pull request #649 from Citadel-Station-13/upstream-merge-26678 
[MIRROR] Ports chem grenades to Initialize
 2017-05-01 07:58:20 -05:00
CitadelStationBot
fad23e97c3 Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass 2017-05-01 07:24:29 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
CitadelStationBot
9d50549c22 Ports chem grenades to Initialize 2017-04-29 08:13:56 -05:00
CitadelStationBot
daeba2eec7 Zombie/limb refactors/fixes 2017-04-28 21:05:06 -05:00
CitadelStationBot
941246e8fe Tank suicide no longer gibs w/o enough pressure 2017-04-28 20:59:39 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
83916bee5d Adds crayon grinding 2017-04-27 09:17:44 -05:00
CitadelStationBot
bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
87ce25df9b Removes a unused chem (#576) 2017-04-26 11:09:00 -05:00
CitadelStationBot
84321916a5 Refactors ears into organs (#513) 
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
 2017-04-26 09:52:35 -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
LetterJay
aa27e92afb Merge pull request #574 from Citadel-Station-13/upstream-merge-26474 
[MIRROR] Gas injectors are now buildable
 2017-04-26 06:45:09 -05:00
CitadelStationBot
45e9b1644e Gas injectors are now buildable 2017-04-26 04:35:40 -05:00
CitadelStationBot
1542ac40c4 Removes an unused var 2017-04-25 23:33:13 -05:00
LetterJay
5d4afa23bc Merge pull request #561 from Citadel-Station-13/upstream-merge-25093 
[MIRROR] Refactors T-Ray Scanners
 2017-04-25 22:29:57 -05:00
LetterJay
16c4f0da66 Merge pull request #563 from Citadel-Station-13/upstream-merge-26420 
[MIRROR] Dance Machine ~Fixes~
 2017-04-25 20:36:43 -05:00
CitadelStationBot
fc0ff20e75 Dance Machine ~Fixes~ 2017-04-25 15:14:54 -05:00
CitadelStationBot
d8a3294686 Refactors T-Ray Scanners 2017-04-25 14:30:08 -05:00
CitadelStationBot
8e4c9f69d6 Fixes flashlight eyes 2017-04-25 03:50:52 -05:00
CitadelStationBot
607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -05:00
LetterJay
a06c6a2994 Merge pull request #508 from Citadel-Station-13/upstream-merge-26337 
[MIRROR] Refactors picture frames to use wall frames system
 2017-04-25 01:10:40 -05:00
CitadelStationBot
4baa357739 Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker 2017-04-24 18:07:12 -05:00
CitadelStationBot
3ebf5ab3bc Fixes objects being used on backpacks if they don't fit 2017-04-24 17:39:27 -05:00
CitadelStationBot
682a00b768 Greyscale lighters no longer color the flame (#517) 2017-04-23 01:35:43 -05:00
CitadelStationBot
05d8550771 Refactors picture frames to use wall frames system 2017-04-21 17:54:34 -05:00
CitadelStationBot
1a93abc66e Conveyor movement refactor/fix 2017-04-21 17:28:09 -05:00
CitadelStationBot
80ec92c9bd Gives wirecutters origin tech 2017-04-19 04:32:43 -05:00
CitadelStationBot
49cef72564 [s] Fixes RCD,RCLD & ARCD (#403) 2017-04-15 14:44:58 -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