shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,187 Commits 5 Branches 0 Tags
35dcf5dce11696048c4f50092c2697b2d7156acd
Commit Graph
13187 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PoojawaandGitHub 35dcf5dce1 Update slaughter.dm 2018-02-06 09:50:12 -06:00
PoojawaandGitHub 79cb10f8ec Update morph.dm 2018-02-06 09:49:46 -06:00
PoojawaandGitHub 1cea674509 Update antag_spawner.dm 2018-02-05 21:35:15 -06:00
deathride58andGitHub 156fa1da1a Update antag_spawner.dm 2018-02-05 21:47:53 -05:00
AnturKandCitadelStationBot f9666ab6c9 Slaughter demon, Morph, ERT / Deathsquad antag datums. 2018-02-05 17:00:09 -06:00
deathride58andGitHub 7b46f951cc Re-enables round autoend 2018-02-05 14:17:14 -05:00
Poojawa 40943eaa35 recompiled tgui 2018-02-05 06:28:56 -06:00
CitadelStationBot 5ea59b5c04 Automatic changelog generation for PR #5291 [ci skip] 2018-02-05 05:36:11 -06:00
CitadelStationBotandPoojawa 92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291) 
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
 2018-02-05 05:36:09 -06:00
CitadelStationBot 571fd8d1d2 Automatic changelog generation for PR #5302 [ci skip] 2018-02-05 05:35:46 -06:00
CitadelStationBotandPoojawa 2ab7a45cb9 If the person inside a morgue tray is clonable, they now beep. Loudly. (#5302) 2018-02-05 05:35:44 -06:00
CitadelStationBot 55741168c0 Automatic changelog generation for PR #5306 [ci skip] 2018-02-05 05:35:20 -06:00
CitadelStationBotandPoojawa 65f026c3ee [MIRROR] Mark pirate ship docking port non-timid (#5306) 
* Mark pirate ship docking port non-timid

* Update pirate_ship.dmm

* Update pirate_ship.dmm
 2018-02-05 05:35:17 -06:00
CitadelStationBotandPoojawa c4107ba117 [MIRROR] Fixes Luminous Slime spam (#5286) 
* Fixes Luminous Slime spam

* Update jellypeople.dm
 2018-02-05 04:56:39 -06:00
CitadelStationBotandPoojawa 98d18ee7e3 [MIRROR] Removes tripai landmark (#5280) 
* Removes tripai landmark

* Update landmarks.dm
 2018-02-05 04:44:31 -06:00
CitadelStationBot 2e71661c47 Automatic changelog generation for PR #5297 [ci skip] 2018-02-05 04:42:16 -06:00
CitadelStationBotandPoojawa e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297) 
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
 2018-02-05 04:42:13 -06:00
CitadelStationBot fd919986f5 Automatic changelog generation for PR #5296 [ci skip] 2018-02-05 04:33:38 -06:00
CitadelStationBotandPoojawa 5c16755e58 [MIRROR] Fixes Vape Pen (e-cig) reagent spam (#5296) 
* Fixes Vape Pen (e-cig) reagent spam

* Update cigs_lighters.dm
 2018-02-05 04:33:36 -06:00
CitadelStationBot d1be1ea28a Automatic changelog generation for PR #5304 [ci skip] 2018-02-05 04:23:12 -06:00
CitadelStationBotandPoojawa 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
PoojawaandGitHub 03b33075e5 Mentor System (#5235) 
* reworked mentor system, again. wew

* Update admin.txt

* uhg
 2018-02-05 04:09:56 -06:00
CitadelStationBot 0eff0b730b Automatic changelog generation for PR #5292 [ci skip] 2018-02-05 03:28:27 -06:00
CitadelStationBotandPoojawa 6db855ad4c [MIRROR] Doubles cog power generation, and allows them to generate power at half efficiency in uncharged APCs (#5292) 
* Doubles cog power generation, and allows them to generate power at half efficiency in uncharged APCs

* Update integration_cog.dm
 2018-02-05 03:28:24 -06:00
CitadelStationBotandPoojawa d4c270fe4a [MIRROR] [READY] Fixes de-initialization of cleanables-ash (#5295) 
* [READY] Fixes de-initialization of cleanables-ash

* Update morgue.dm

* Update morgue.dm
 2018-02-05 03:20:09 -06:00
CitadelStationBot 9b453dfd35 Automatic changelog generation for PR #5290 [ci skip] 2018-02-05 03:19:56 -06:00
CitadelStationBotandPoojawa fa38b8a2f3 [MIRROR] Readds the syndicate comms officer (#5290) 
* Readds the syndicate comms officer

* Update listeningstation.dmm
 2018-02-05 03:19:54 -06:00
PoojawaandGitHub b086691e54 Update cit_guns.dm 2018-02-05 03:02:29 -06:00
CitadelStationBot 4c58e1cb74 Automatic changelog generation for PR #5260 [ci skip] 2018-02-05 03:00:24 -06:00
CitadelStationBotandPoojawa 43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260) 
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
 2018-02-05 03:00:22 -06:00
CitadelStationBotandPoojawa b0fb541b8c [MIRROR] Adds some customization to ruin loader (#5289) 
* Adds some customization to ruin loader

* Update maps.dm
 2018-02-05 02:33:20 -06:00
CitadelStationBotandPoojawa 5385333a64 Fixes some broken accesses (#5287) 2018-02-05 02:25:16 -06:00
CitadelStationBotandPoojawa c2f14117c4 [MIRROR] Lava map slights (#5273) 
* Lava map slights (#35201)

* Updates a few maps a tad on lavaland

* Adds two freezers to syndicate lavaland for some chefing

* Lava map slights
 2018-02-05 02:09:45 -06:00
CitadelStationBotandPoojawa 7149ae03b7 [MIRROR] Fixes blood overlay layers. (#5277) 
* Fixes blood overlay layers.

* Update blood.dm
 2018-02-05 02:09:29 -06:00
CitadelStationBot 6ded56a3a9 Automatic changelog generation for PR #5274 [ci skip] 2018-02-05 02:09:18 -06:00
CitadelStationBotandPoojawa ec127471e8 Makes departemental lathes easier to access. (#5274) 2018-02-05 02:09:16 -06:00
CitadelStationBot 3165799c20 Automatic changelog generation for PR #5271 [ci skip] 2018-02-05 01:47:18 -06:00
CitadelStationBotandPoojawa 32fab09c69 [MIRROR] Remove revenantspawn landmark from code (#5271) 
* Remove revenantspawn landmark from code (#35238)

* Remove revenantspawn landmark from code
 2018-02-05 01:47:16 -06:00
CitadelStationBot ded35f585d Automatic changelog generation for PR #5266 [ci skip] 2018-02-05 01:39:39 -06:00
CitadelStationBotandPoojawa afb0b08837 [MIRROR] Fixes servant cyborgs with the Standard module not having Abscond (#5266) 
* Fixes servant cyborgs with the Standard module not having Abscond

* Update clockwork_slab.dm

* Update clockwork_slab.dm
 2018-02-05 01:39:36 -06:00
CitadelStationBot 921e149cf6 Automatic changelog generation for PR #5293 [ci skip] 2018-02-05 01:31:18 -06:00
CitadelStationBotandPoojawa b16d2148e4 [MIRROR] Steampunk Watches! (#5293) 
* Steampunk Watches! (#35187)

* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!

* Steampunk Watches!
 2018-02-05 01:31:16 -06:00
CitadelStationBot 0f39cda70d Automatic changelog generation for PR #5264 [ci skip] 2018-02-05 01:30:44 -06:00
CitadelStationBotandPoojawa 88fdac3579 [MIRROR] Removes ketrazine (#5264) 
* Removes ketrazine

* Update medicine_reagents.dm
 2018-02-05 01:30:42 -06:00
CitadelStationBotandPoojawa 64c43ee5bc Morgue Trays now provide correct light-indication (#5262) 2018-02-05 01:26:36 -06:00
CitadelStationBot 9165aa72da Automatic changelog generation for PR #5263 [ci skip] 2018-02-05 01:26:22 -06:00
NickandPoojawa aebeaa35ae aghh (#5263) 2018-02-05 01:26:20 -06:00
CitadelStationBot 05142a3d2a Automatic changelog generation for PR #5243 [ci skip] 2018-02-05 01:23:48 -06:00
Zna12andPoojawa a89e9f20aa Foam-Force Assault Machines. (#5243) 
* REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

i HAVE NO IDEA WHAT I'M DOING

* Wew. Managed to add the AM4 to the thingy.

WYSIWYG

* ALMOST DONEEEE

Wew. Just a few more tweaks

* To be reverted.

This is just adding a file of the sprite for the mag so I can work at work

* AM4B Complete, Moving to AM4C

And also I need to make the magazines.

* One step forward two steps back.

Magazine sprites are in. still need to test it.

* Forgot to save a file.

Woops.

* AM4 Finished.

Adds two weapons, the AM4-B and the AM4-C. Yes they're supposed to look like the MA5.

* Reverted those last couple things.

Deleted some loose files that I didn't actually need. Whoops.
 2018-02-05 01:23:46 -06:00
CitadelStationBot b5c6ef3648 Automatic changelog generation for PR #5261 [ci skip] 2018-02-05 01:10:31 -06:00