shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,427 Commits 5 Branches 0 Tags
ac38cb893ef1f183ee202f20c8a096a7891c4a51
Commit Graph

213 Commits

Author SHA1 Message Date
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815 
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
 2018-04-05 00:17:27 +00:00
deathride58
4636817ab5 Update packs.dm 2018-04-04 17:18:36 -04:00
LetterJay
89f382df4e Merge pull request #6025 from Poojawa/increase-age-gap 
Increase age gap
 2018-04-02 06:57:24 -05:00
LetterJay
5dbb046757 Merge pull request #6131 from deathride58/gearIDwhitelists 
Adds support for manipulating gear entries via config
 2018-04-02 05:50:10 -05:00
LetterJay
66420d8504 Merge pull request #6116 from cebutris/moreminerloot 
adds lavaknight corpses to legion drops
 2018-04-02 05:47:30 -05:00
LetterJay
b09d271e17 Merge pull request #6174 from Michiyamenotehifunana/polychrome-Cloth-Globalize 
(Partially) Globalizes Polychromic Clothing Code
 2018-04-02 05:43:18 -05:00
Poojawa
75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05:00
LetterJay
d36fac0662 another donator item 2018-03-31 21:49:15 -05:00
DavenPeace1
7bffe7110b OctopusTime 2018-03-29 18:32:05 -07:00
Michiyamenotehifunana
7015e631a2 Fixes everything, adds loadout stuff 
"Fix" mandates the usage of workarounds
 2018-03-29 23:51:55 +08:00
deathride58
77f40b6be9 Merge pull request #6093 from Michiyamenotehifunana/no-more-mk37 
Removes the Mk.37
 2018-03-27 17:53:12 +00:00
Michiyamenotehifunana
fb97695b6a Globalized, Broke everything 2018-03-27 22:40:27 +08:00
deathride58
3323a5e284 adds the ability to define gear entry whitelists via config 2018-03-27 01:33:02 -04:00
LetterJay
0baeeb548d Merge pull request #6094 from Citadel-Station-13/kevinz000-patch-1 
Increases arousal performance, bandaid patch
 2018-03-26 22:39:11 -05:00
Cebutris
3102b47775 Makes the desc more generic 2018-03-26 09:46:54 -04:00
Cebutris
2fd234256e adds lavaknight corpses to legion drops 2018-03-26 09:29:22 -04:00
Poojawa
c579d81f4c Vore fixes and a few additions (#6032) 
* Fixes saving memes, Adds absorbing and OOC escape

Also allows for people to reload from a slot if they fuck up and delete a belly

* makes sure travis won't flip the fuck out

* fixes some sound issues

* cleaning up some extra sounds, also dragon vore sound settings

* fixes resisting out of guts

* BRACKETS

* Prey now become blind after being eaten.

Use the audible subtle message to continue roleplaying with them!

* Actually make bulges show up in examine

* Fixes cases where transfering between bellies would blind twice

Because, y'know, that make sense. Also added self reminders if any changes happen to JSONs
 2018-03-26 04:46:50 -05:00
Poojawa
77872a1526 makes IPCs bleed oil (#6054) 2018-03-24 12:35:17 -07:00
Ziiro
b70381c89e Adds IPC Antennas (#6049) 2018-03-24 12:33:19 -07:00
GrayRachnid
04a761838d Makes blood cult combat rework compatible. (#6085) 
* Update blood_magic.dm

* Add files via upload

* Update blood_magic.dm

* Update blood_magic.dm

* Update tgstation.dme

* oops i used the wrong backslash
 2018-03-24 12:32:39 -07:00
kevinz000
2cd98340de typed 2018-03-24 06:08:58 -07:00
kevinz000
c73d2763e5 Update arousal.dm 2018-03-24 05:52:08 -07:00
kevinz000
bef056c034 why did we have that there 2018-03-24 05:39:35 -07:00
kevinz000
037d800e34 performant arousal 2018-03-24 05:37:49 -07:00
Michiyamenotehifunana
a9bdb032e7 removes code bloat 2018-03-24 14:21:14 +08:00
LetterJay
cdf0ba3def Oops 2018-03-23 12:18:48 -05:00
LetterJay
41c6c4aa4b wrong location 2018-03-22 22:23:42 -05:00
Poojawa
cba5016ab3 Merge branch 'master' into increase-age-gap 2018-03-22 19:53:48 -05:00
Poojawa
68b0ecc48e forgot science, whoops 2018-03-22 19:52:55 -05:00
Poojawa
c9e8478f24 reee 2018-03-22 19:50:40 -05:00
LetterJay
09cd9189e3 fixes missing shock collar icon 2018-03-22 12:10:08 -05:00
LetterJay
b3b8c5c7e6 donator stuff, cleans up file 2018-03-21 23:00:47 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907) 
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
 2018-03-21 15:28:06 -05:00
deathride58
0a331a26ee Merge pull request #5994 from Poojawa/beepboop 
Adds IPCs refractors preferences
 2018-03-21 19:20:43 +00:00
LetterJay
613d54ad4e Update __donator.dm 2018-03-21 00:36:40 -05:00
LetterJay
8797bdace1 donator cloak thing, going to bed 2018-03-21 00:29:11 -05:00
Poojawa
8377bdf9a8 fixes some screen issues 2018-03-20 23:53:55 -05:00
Poojawa
f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
Michiyamenotehifunana
61fde978e1 Tennis Balls! (and donator stuff) (#5962) 
* Donator rainbow stuff and balls!

* Updates code and adds izzy's donator thing

* Adds right click memes!
 2018-03-20 19:11:34 -05:00
Poojawa
2bb09bef5f Adds additional screen 'faces', allows switching of screens in game 
also puts jelly people in with the jelly people file.
 2018-03-20 13:53:52 -05:00
Poojawa
af82e1109f slight tweaks, revert job controller changes, penor layering tweaked 2018-03-20 10:41:36 -05:00
deathride58
9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime 
Hopefully crushes some runtimes
 2018-03-20 15:26:43 +00:00
LetterJay
15109ad50a Merge pull request #6029 from Citadel-Station-13/LetterJay-shockcollar 
Fixes autolathes not building shockcollars
 2018-03-20 10:10:36 -05:00
LetterJay
089c2e70b2 fixes runtime in donator 
fixes runtime in donator
 2018-03-20 09:34:22 -05:00
LetterJay
e01a0d521d Update shockcollar.dm 2018-03-19 23:44:13 -05:00
Poojawa
8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
Poojawa
088f3fda5d Gives a prompt for people to see who is replying to an mhelp (#5963) 2018-03-19 21:27:41 -05:00
Poojawa
d593e46c6b working as intended now and improved 2018-03-19 07:00:05 -05:00
Poojawa
b27c5cd3b0 Revert "SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress." 
This reverts commit a2fbab5ccb.
 2018-03-19 05:32:12 -05:00
Poojawa
a2fbab5ccb SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress. 2018-03-19 04:57:57 -05:00