shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,854 Commits 5 Branches 0 Tags
up-to-date
Commit Graph
2298 Commits
Author SHA1 Message Date
DavenPeace1 f5e07db1b5 More extras! 2018-04-18 23:56:43 -03:00
deathride58andGitHub 5f37b59107 on second thought, the cell usage change is a little dumb, the stamloss per watt isnt much different from its original value 2018-04-17 22:32:25 -04:00
deathride58andGitHub 521cc43664 makes pump-disabler slug slightly more cell-efficient than pump-disabler spread 2018-04-17 21:26:00 -04:00
deathride58andGitHub 9678de1f2f the fuck are these numbers 2018-04-17 21:17:54 -04:00
LetterJayandGitHub b3f42dce0b Update __donator.dm 2018-04-15 21:56:02 -05:00
Chayse Ramsayandkevinz000 58111c6482 Fixing slimepeople (#6386) 2018-04-12 08:39:44 -07:00
deathride58andkevinz000 4b87170139 Adds "Man up" verb for admins. (#6296) 
* adds man up verb

* Update admin_verbs.dm

* adds man up global

* blech
 2018-04-10 17:34:45 -07:00
LetterJayandGitHub 33d6ee9f96 Update __donator.dm 2018-04-10 11:54:50 -05:00
Michiyamenotehifunana 4c86571f9a Preliminary polish and implementation of exclusive polychromics 2018-04-10 22:56:16 +08:00
deathride58andGitHub e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
kevinz000andGitHub 820f4e7998 Update preferences.dm 2018-04-08 19:40:57 -07:00
kevinz000andGitHub 83f1332229 >wiped my flavortext accidently 2018-04-08 19:39:06 -07:00
deathride58andGitHub 8abcb08d9e Merge pull request #6249 from Citadel-Station-13/kevinz000-patch-3 
meme update
 2018-04-08 04:17:06 +00:00
deathride58 87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawaanddeathride58 5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
deathride58andGitHub 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
deathride58andGitHub 4636817ab5 Update packs.dm 2018-04-04 17:18:36 -04:00
loginsandylogoutandGitHub 740c76beb9 damn 2018-04-04 13:23:15 -05:00
loginsandylogoutandGitHub 34fe469aa2 hold on 2018-04-04 13:22:27 -05:00
loginsandylogoutandGitHub c2615881c7 ah 2018-04-04 13:21:42 -05:00
loginsandylogoutandGitHub e7612b44fe should fix it all 2018-04-04 13:19:59 -05:00
loginsandylogoutandGitHub e14ff635ec okay 2018-04-04 13:18:54 -05:00
loginsandylogoutandGitHub 7459b8b03c hhhj 2018-04-04 13:16:49 -05:00
loginsandylogoutandGitHub c27cb38a53 hhh 2018-04-04 13:14:30 -05:00
loginsandylogoutandGitHub 53454d8ab9 d 2018-04-04 13:13:30 -05:00
loginsandylogoutandGitHub 3b4b557687 a 2018-04-04 13:12:52 -05:00
loginsandylogoutandGitHub d2cf2e8018 HMMM 2018-04-04 13:12:27 -05:00
loginsandylogoutandGitHub d845bf84a9 k 2018-04-04 12:56:34 -05:00
loginsandylogoutandGitHub a4e3b19891 maybe 2018-04-04 12:55:52 -05:00
loginsandylogoutandGitHub 417fa9e264 yes 2018-04-04 12:52:40 -05:00
loginsandylogoutandGitHub cee51cd79d should fix conflicts 2018-04-04 12:50:02 -05:00
kevinz000andGitHub 7b91a07658 kek 2018-04-02 19:53:36 -07:00
LetterJayandGitHub 89f382df4e Merge pull request #6025 from Poojawa/increase-age-gap 
Increase age gap
 2018-04-02 06:57:24 -05:00
LetterJayandGitHub 5dbb046757 Merge pull request #6131 from deathride58/gearIDwhitelists 
Adds support for manipulating gear entries via config
 2018-04-02 05:50:10 -05:00
LetterJayandGitHub b09d271e17 Merge pull request #6174 from Michiyamenotehifunana/polychrome-Cloth-Globalize 
(Partially) Globalizes Polychromic Clothing Code
 2018-04-02 05:43:18 -05:00
loginsandylogoutandGitHub 2d038f3f94 gay 2018-04-01 18:31:26 -05:00
PoojawaandGitHub 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
loginsandylogoutandGitHub a4d949816b increased glove csost 2018-03-30 13:38:07 -05:00
DavenPeace1andkevinz000 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
deathride58andGitHub 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
LetterJayandGitHub 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
PoojawaandGitHub 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
Poojawaandkevinz000 77872a1526 makes IPCs bleed oil (#6054) 2018-03-24 12:35:17 -07:00
Ziiroandkevinz000 b70381c89e Adds IPC Antennas (#6049) 2018-03-24 12:33:19 -07:00
GrayRachnidandkevinz000 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
kevinz000andGitHub 2cd98340de typed 2018-03-24 06:08:58 -07:00