shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,154 Commits 5 Branches 0 Tags
b97b595f6fca8c950c48b085380cc795c3bf9200
Commit Graph
16634 Commits
Author SHA1 Message Date
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
timothyteakettle af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
siliconsandGitHub 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix 
Added health exemption to a couple events that need it.
 2020-08-30 13:15:10 -07:00
Putnam cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -07:00
TrilbyspacecloneandGitHub da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Putnam 66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00
Putnam 3097c790b8 Added an extra test. 2020-08-29 23:02:18 -07:00
Putnam e97ef2d84d Added a character saving unit test. 2020-08-29 22:58:04 -07:00
raspy-on-osu c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
TrilbyspacecloneandGitHub 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
siliconsandGitHub bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again 
Rolling dynamic tweaks 'til it works
 2020-08-29 21:41:06 -07:00
siliconsandGitHub d4bc6f9fee Merge pull request #13298 from DeltaFire15/eminence-updates 
Modifies the Eminence teleport-to abilties a bit
 2020-08-29 21:40:22 -07:00
siliconsandGitHub 05b5d39732 Update ballistic.dm 2020-08-29 21:38:45 -07:00
siliconsandGitHub bf678a25da Merge pull request #13024 from zeroisthebiggay/saltprfuckwaffles 
The PR That Comments Out Waffleco From Appearing AKA Fuck The Traitors ERPing Every Single Round
 2020-08-29 21:35:58 -07:00
Tupinambis 39eac62dcd moves growth pills and genital autosurgeons to the kinkmate 2020-08-29 23:35:35 -05:00
siliconsandGitHub 9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer 
Portable chem mixer
 2020-08-29 21:34:57 -07:00
siliconsandGitHub 16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj 
reskin_obj is now a radial
 2020-08-29 21:33:28 -07:00
siliconsandGitHub 5f40c2da37 Merge pull request #13229 from Sonic121x/patch-2 
Fix Tea and give them a glass sprite
 2020-08-29 21:33:21 -07:00
siliconsandGitHub 413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox 
Buffs/hugboxes slaughter demons
 2020-08-29 21:32:58 -07:00
siliconsandGitHub 033feebcd0 Merge pull request #12957 from kappa-sama/patch-34 
removes malf disk from tendril loot
 2020-08-29 21:31:24 -07:00
siliconsandGitHub 50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull 
Tesla Counterplay.
 2020-08-29 21:24:41 -07:00
siliconsandGitHub 4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836 
Fixing some mistakes with the priority overlays removal PR.
 2020-08-29 21:22:44 -07:00
siliconsandGitHub 84734591ed Merge pull request #13268 from timothyteakettle/accents 
separates tongues speech handling into accent datums
 2020-08-29 21:22:11 -07:00
siliconsandGitHub 78b8072d13 Merge pull request #13272 from Detective-Google/patch-1 
plasmamen are playable now
 2020-08-29 21:21:23 -07:00
siliconsandGitHub 7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes 
every emote is unrestricted
 2020-08-29 21:21:01 -07:00
siliconsandGitHub e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework 
Reworks Anatomic Panacea
 2020-08-29 21:19:47 -07:00
siliconsandGitHub e16abbc945 Merge pull request #13280 from raspy-on-osu/teg-castration-2 
Further tweaks the TEG's power output
 2020-08-29 21:19:18 -07:00
siliconsandGitHub 5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref 
Added genital/vore examine text prefs
 2020-08-29 21:19:03 -07:00
siliconsandGitHub ad1ab7c7c4 Merge pull request #13290 from ForrestWick/funnynoclip 
Nukies can't get wall-boots anymore
 2020-08-29 21:17:26 -07:00
Putnam dd6be82e06 Made heretics scale dynamic threat with power. 2020-08-29 18:43:15 -07:00
Putnam 6725ced453 Makes heretics actually able to be edited in the config. 2020-08-29 16:45:16 -07:00
DeltaFire 105c98d12f eminence moment 
commants out 'teleport to ark', gives the Eminence the ability to teleport to obelisks instead.
 2020-08-29 21:30:20 +02:00
Putnam 177bfaefaf Added health exemption to a couple events that need it. 2020-08-29 04:46:18 -07:00
lolman360 f223c9eeb5 eee 2020-08-29 18:38:17 +10:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
ForrestWick 84ed82c9e7 whyseris 2020-08-28 22:09:30 -04:00
kiwedespars 578f078a2d whoops i forgot to make it not emp 2020-08-28 16:46:55 -07:00
kiwedespars a7d68281a3 new changes 
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
 2020-08-28 16:42:25 -07:00
siliconsandGitHub adc75a1d50 Merge branch 'master' into revert-13122-haha 2020-08-28 15:31:38 -07:00
Putnam c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
raspy-on-osu d116dd49b2 teg tweak 2020-08-27 23:04:00 -04:00
lolman360 c2ded74d6a e 2020-08-28 12:54:58 +10:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle 398692df0b emotes 2020-08-27 20:24:37 +01:00
Lynxless 4caeb310f7 Added blank line to the end of files 2020-08-27 15:59:07 -03:00
Lynxless 828a65a7fd New branch test 2020-08-27 15:46:40 -03:00
Chiirno fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
siliconsandGitHub b162d8184d Merge pull request #13237 from Hatterhat/pda-bomb-limited 
pda bomb buyonce
 2020-08-27 10:07:05 -07:00