shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,166 Commits 5 Branches 0 Tags
e5aa6ea1cd223c08935cdcdab4e2d8a4e5127ffa
Commit Graph

1690 Commits

Author SHA1 Message Date
CitadelStationBot 5de94c22e7 Fixes grammar error on spawner grenades 2017-05-04 20:25:46 -05:00
CitadelStationBot 4a142759a0 New Tree Sprites 2017-05-04 17:58:58 -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 827bbb13c2 Adds an effect to Mending Mantra to show who is chanting it 2017-05-04 17:49:28 -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
LetterJay d5ade71ea9 Merge pull request #706 from Citadel-Station-13/upstream-merge-26745 
[MIRROR] Adds persistent trophy cases
 2017-05-03 22:49:50 -05:00
CitadelStationBot 021f55a4d1 Fixes alien eggs 2017-05-03 22:22:26 -05:00
CitadelStationBot 33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
LetterJay 337e9ca937 Merge pull request #715 from Citadel-Station-13/upstream-merge-26769 
[MIRROR] Fixes proximity sensors not tracking correctly
 2017-05-02 18:45:21 -05:00
CitadelStationBot ce302f4fe7 Trophy case hotfixes 2017-05-02 14:37:11 -05:00
LetterJay fe5e1db512 Merge pull request #718 from Citadel-Station-13/upstream-merge-26765 
[MIRROR] Makes golems able to transfer into empty shells
 2017-05-02 12:24:24 -05:00
LetterJay 6310292531 woo 2017-05-02 11:19:14 -05:00
CitadelStationBot 25f1b24f62 Makes golems able to transfer into empty shells 2017-05-02 10:00:33 -05:00
CitadelStationBot 913a0c7c7f Fixes proximity sensors not tracking correctly 2017-05-02 09:55:15 -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
LetterJay 4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
CitadelStationBot 036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot ea3ee7accc Adds persistent trophy cases 2017-05-01 17:31:24 -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
LetterJay 5cab328632 Merge pull request #638 from Citadel-Station-13/upstream-merge-26536 
[MIRROR] Nerfs and buffs The Traps
 2017-05-01 07:44:15 -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
LetterJay 0cf401934b manual merge 2017-04-29 07:57:16 -05:00
CitadelStationBot daeba2eec7 Zombie/limb refactors/fixes 2017-04-28 21:05:06 -05:00
CitadelStationBot e1883354ba Nerfs and buffs The Traps 2017-04-28 21:03:57 -05:00
CitadelStationBot 941246e8fe Tank suicide no longer gibs w/o enough pressure 2017-04-28 20:59:39 -05:00
CitadelStationBot 717d63f129 Adds new debug verb for highlighting roundstart ATs 2017-04-28 10:59:14 -05:00
LetterJay a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 
[MIRROR] Initialize Refactor
 2017-04-28 09:29:00 -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 cea81a3357 Initialize Refactor 2017-04-26 16:03:17 -05:00
CitadelStationBot e7df2bc14a [MIRROR] Minor refactors (#515) 
* Minor refactors

* Update client_procs.dm

* Delete client_procs.dm.rej
 2017-04-26 11:13:41 -05:00
CitadelStationBot 87ce25df9b Removes a unused chem (#576) 2017-04-26 11:09:00 -05:00
Poojawa 328ddaba1f Delete window.dm.rej 2017-04-26 10:15:54 -05:00
Poojawa bb97f09b74 Update window.dm 2017-04-26 10:15:44 -05:00
CitadelStationBot b1d6b6a277 [MIRROR] Drake swooping is smoother and more dangerous (#571) 
* Drake swooping is smoother and more dangerous

* Update dragon.dm

* Delete dragon.dm.rej
 2017-04-26 10:11:33 -05:00
CitadelStationBot f881683902 Fixes windows going invisible (#567) 2017-04-26 10:11:11 -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