shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,908 Commits 5 Branches 0 Tags
980d69dde329777e98a372917dd030a85970f3a3
Commit Graph
14908 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBotandPoojawa 980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000) 
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
 2018-03-19 21:25:01 -05:00
CitadelStationBotandPoojawa 3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004) 
* Replaced body zone magic strings with defines

* merge conflicts
 2018-03-19 21:18:57 -05:00
CitadelStationBotandPoojawa 9338d18a28 [MIRROR] Techweb fixes (#6023) 
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
 2018-03-19 21:18:35 -05:00
CitadelStationBotandPoojawa b74454bf5c [MIRROR] Tweaks to ERT creation (#6021) 
* inquisition ert tweak (#36511)

* Tweaks to ERT creation
 2018-03-19 21:18:02 -05:00
CitadelStationBotandPoojawa fcbc76a7a9 [MIRROR] Pacifists can now use mech drills on closets containing living beings (#6020) 
* Pacifists can now use mech drills on closets containing living beings

* Removes no longer needed Mecha code relating to Pacifist use of drills. Also alters variables to be more consistent. (#36494)
 2018-03-19 21:16:44 -05:00
CitadelStationBotandPoojawa 889ff6fa08 [MIRROR] circuit diagnostic status icon changes (#6019) 
* circuit diagnostic status icon changes

* circuit diagnostic status icon changes (#36218)

* circuit diagnostic hud revisit

warning icon replaced with red versions of prefered icons, new icons added to the AR interface

* did this fix it?

* ok how about now

put all the new icons at the end of the file instead of at different places inside
 2018-03-19 21:16:26 -05:00
CitadelStationBotandPoojawa c8004a088e [MIRROR] Crayons and spraycans can no longer infinitely draw large graffiti (#6001) 
* Crayons and spraycans can no longer infinitely draw large graffiti (#36412)

🆑 SailorDave
fix: Crayons and spraycans can no longer draw an unlimited amount of large graffiti regardless of uses left.
/🆑

Fixes https://github.com/tgstation/tgstation/issues/35833

The check_empty() at the top of the afterattack() was only checking if the can was empty, not if the amount of charges left was less than the spray amount. This is fixed.

* Crayons and spraycans can no longer infinitely draw large graffiti
 2018-03-19 21:16:00 -05:00
CitadelStationBotandPoojawa df15bbe0f0 [MIRROR] New & Fixed AI VOX Sound Files (#6003) 
* New & Fixed AI VOX Sound Files

* Update vox_sounds.dm
 2018-03-19 21:15:34 -05:00
CitadelStationBotandPoojawa 1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017) 
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
 2018-03-19 21:12:46 -05:00
CitadelStationBotandPoojawa 0c1fc7ff61 [MIRROR] Gives warning message to holodeck mobs that gain sentience via sentience potions. (#6016) 
* Adds warning message to holodeck mobs that are made sentient. (#36472)

* Gives warning message to holodeck mobs that gain sentience via sentience potions.
 2018-03-19 21:12:21 -05:00
CitadelStationBotandPoojawa 51a7f39176 [MIRROR] Updates rhumba beat to be more different from GBS (#6015) 
* Updates rhumba beat to be more different from GBS

* Updates rhumba beat to be more different from GBS (#36439)

* Update rhumba_beat.dm

* clarifying comment
 2018-03-19 21:11:54 -05:00
CitadelStationBotandPoojawa 009f95db42 [MIRROR] Electronic assembly changes and additions (#6014) 
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
 2018-03-19 21:11:23 -05:00
CitadelStationBotandPoojawa 6aaef3b010 [MIRROR] Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs] (#6013) 
* Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs]

* RND techwebs: Mineral access (#36387)
 2018-03-19 21:08:54 -05:00
CitadelStationBotandPoojawa fd63838558 [MIRROR] Circuits constants chips now keep their data on save/load (#6012) 
* Circuits constants chips now keep their data on save/load

* Fixes constants chips (#36315)
 2018-03-19 21:08:24 -05:00
CitadelStationBotandPoojawa dac99faf65 [MIRROR] Brain Damage Trait (#6011) 
* Brain Damage Trait

* Brain Damage Trait (#36235)

* OK FINE GOD.

* balance??
 2018-03-19 21:07:57 -05:00
CitadelStationBotandPoojawa e6cee90e4c [MIRROR] Adds missing space to lobby music toggle (#6010) 
* Adds missing space to lobby music toggle

* Adds missing space to lobby music toggle (#36517)
 2018-03-19 21:07:36 -05:00
CitadelStationBotandPoojawa 777a4473d8 [MIRROR] Fixes roundend report runtmining if no traitor had a uplink. (#6009) 
* Fixes roundend report runtmining if no traitor had a uplink.

* Merge pull request #36461 from AnturK/broken-uplink-log

Fixes roundend report runtmining if no traitor had a uplink.
 2018-03-19 21:07:18 -05:00
CitadelStationBotandPoojawa 26e1aec9d8 [MIRROR] Massively slows Spaceacillin metabolism (#6005) 
* Massively slows Spaceacillin metabolism

* Update medicine_reagents.dm
 2018-03-19 21:06:56 -05:00
CitadelStationBotandPoojawa 1fd5de5bfe [MIRROR] Fixes stacks and material containers, fixes wet floors (#6008) 
* Fixes stacks and material containers, fixes wet floors (#36497)

* Fixes stacks and material containers, fixes wet floors
 2018-03-19 21:06:33 -05:00
CitadelStationBotandPoojawa c17da68be6 [MIRROR] Removes completely unnecessary block of code in reactions.dm (#6007) 
* Removes completely unnecessary block of code in reactions.dm

* removes block of code (#36474)
 2018-03-19 21:06:01 -05:00
LetterJayandGitHub 4f07c9f856 Merge pull request #5995 from Citadel-Station-13/donator 
sabre and sheath
 2018-03-18 22:03:11 -05:00
LetterJay 6ee530b30a die 2018-03-18 20:16:50 -05:00
LetterJayandGitHub 9e072fe328 Update __donator.dm 2018-03-18 19:28:51 -05:00
LetterJay 46733bca65 type path 2018-03-18 16:54:43 -05:00
LetterJay f55ad18f69 fk 2018-03-18 15:54:43 -05:00
LetterJay e163a889fb i hate this shit 2018-03-18 15:53:20 -05:00
LetterJay 18759e03b3 op 2018-03-18 15:47:48 -05:00
LetterJay 380ec76618 sabre and sheath 2018-03-18 12:18:08 -05:00
deathride58andGitHub 02c3f6d0a0 Merge pull request #5985 from Citadel-Station-13/upstream-merge-36399 
[MIRROR] Fixes the tesla coil research screwdrivering
 2018-03-18 00:18:55 +00:00
deathride58andGitHub 082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459 
[MIRROR] Clown Ops
 2018-03-17 23:58:15 +00:00
deathride58andGitHub 087255b1f1 Merge pull request #5904 from Poojawa/sprite-tweaks 
Ckey locks on Sprite_accessories!
 2018-03-17 23:57:16 +00:00
deathride58andGitHub 542208445b Merge pull request #5901 from NopeMcHaltman/cit_mood 
Some minor mood additions
 2018-03-17 23:56:50 +00:00
deathride58andGitHub f74aa475c1 Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449 
[MIRROR] Chem dispenser upgrade
 2018-03-17 23:55:32 +00:00
deathride58andGitHub 79db79f630 Merge pull request #5987 from Citadel-Station-13/upstream-merge-36437 
[MIRROR] Tesla coils and grounding rods actually shock buckled mobs.
 2018-03-17 23:54:50 +00:00
deathride58andGitHub a9f8c70d62 Merge pull request #5986 from Citadel-Station-13/upstream-merge-36364 
[MIRROR] Changes stormtrooper ammo to 10g slugs
 2018-03-17 23:54:33 +00:00
deathride58andGitHub d2926f3ba9 Merge pull request #5984 from Citadel-Station-13/upstream-merge-36470 
[MIRROR] Fixes admins not working in certain cases
 2018-03-17 23:54:16 +00:00
deathride58andGitHub df8fe921cc Merge pull request #5983 from Citadel-Station-13/upstream-merge-36478 
[MIRROR] Gibs admin observers follow links
 2018-03-17 23:53:57 +00:00
deathride58andGitHub 50a05952d2 Merge pull request #5982 from Citadel-Station-13/upstream-merge-36475 
[MIRROR] Fixed diseases getting negative points
 2018-03-17 23:53:32 +00:00
deathride58andGitHub fa62612298 Merge pull request #5980 from Citadel-Station-13/upstream-merge-36438 
[MIRROR] Fixes ghost portal teleportation
 2018-03-17 23:53:10 +00:00
deathride58andGitHub d30be811be Merge pull request #5979 from Citadel-Station-13/upstream-merge-36410 
[MIRROR] Fixes dupe and runtime issues with Rod of Asclepius
 2018-03-17 23:52:52 +00:00
deathride58andGitHub fe801a89ac Merge pull request #5978 from Citadel-Station-13/upstream-merge-36401 
[MIRROR] Mech drills behave more realistically
 2018-03-17 23:51:56 +00:00
deathride58andGitHub 8b2aa30d6f Merge pull request #5977 from Citadel-Station-13/upstream-merge-36443 
[MIRROR] Makes vanilla ice cream... require vanilla!
 2018-03-17 23:51:37 +00:00
deathride58andGitHub a93edc6e17 Merge pull request #5976 from Citadel-Station-13/upstream-merge-36422 
[MIRROR] Updates a bunch of tips and adds new ones
 2018-03-17 23:51:20 +00:00
deathride58andGitHub 0f5b8c228e Merge pull request #5975 from Citadel-Station-13/upstream-merge-36419 
[MIRROR] Lavaland / Lavaplanet is now visible from space
 2018-03-17 23:50:59 +00:00
deathride58andGitHub 238c8b24e2 Merge pull request #5974 from Citadel-Station-13/upstream-merge-36425 
[MIRROR] Sec officers always like donuts
 2018-03-17 23:50:30 +00:00
deathride58andGitHub b8d6bc53cf Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432 
[MIRROR] Fixes brain damage json runtime
 2018-03-17 23:50:10 +00:00
deathride58andGitHub 304ac2f89c Merge pull request #5972 from Citadel-Station-13/upstream-merge-36446 
[MIRROR] Fix stray pixels in Death Ripley sprite
 2018-03-17 23:49:53 +00:00
deathride58andGitHub f5e49123e0 Merge pull request #5971 from Citadel-Station-13/upstream-merge-36409 
[MIRROR] Fixed cameras holding up the arrival shuttle
 2018-03-17 23:49:23 +00:00
deathride58andGitHub 1fc5fe361c Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393 
[MIRROR] Fixes bluespace radio potions
 2018-03-17 23:49:02 +00:00
deathride58andGitHub b9a73ded87 Update coil.dm 2018-03-17 19:48:42 -04:00