2316 Commits

Author SHA1 Message Date
Fermi 645dfca14a Compile ready. 2019-05-23 23:17:17 +01:00
Fermi 2f7a4082ab woooah. 2019-05-23 23:09:32 +01:00
Fermi 8a8178a0b1 I uh, I'm worried this won't compile for some reason. 2019-05-23 20:52:20 +01:00
Fermi 310344e828 EVERYTHING BROKE AAAAAAAAAAAAAAAAAA 2019-05-23 20:21:52 +01:00
Fermi a480ccb9fa Changes 2019-05-23 05:26:38 +01:00
Fermi 9da13f231c OOPS BROKE LUNGS 2019-05-22 20:23:45 +01:00
kevinz000 5d40d4b9a2 sprint stamina stuff 2019-05-22 12:18:47 -07:00
Fermi f932fadfc6 Blood commit. 2019-05-22 18:46:46 +01:00
Fermi 41d991e81c Pre blood commit 2019-05-22 18:13:12 +01:00
Trilbyspaceclone 3bf667ba36 Update magweapon_energy.dm 2019-05-22 12:42:28 -04:00
Trilbyspaceclone 005647d4f6 Update magweapon_energy.dm 2019-05-22 12:12:06 -04:00
Fermi fc3482ec90 Squeak! 2019-05-22 16:51:52 +01:00
Fermi 7cb7f5de73 Update of master required. 2019-05-22 16:50:53 +01:00
Poojawa 971ddef989 reverts forensics components. If I can't figure it out, MURDER IT 2019-05-22 04:10:29 -05:00
Poojawa f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-22 00:08:13 -05:00
Poojawa 25463f22b2 Fixes species getting genitals at all if NOGENITAL'd
Holy FUCK this code is bad.
2019-05-21 23:52:19 -05:00
Fermi e86585935f MidFix - compile unsafe. 2019-05-22 02:25:05 +01:00
Fermi 485def8d28 More fixed upon the last! 2019-05-21 22:06:55 +01:00
Fermi ac3f0c790e Fixed compling errors from last time. 2019-05-21 20:28:40 +01:00
Fermi be4f188589 FermiChem? More like, FermiFixes! 2019-05-21 20:08:46 +01:00
kevinz000 74af355079 Merge pull request #8392 from Poojawa/donator-item-fixing
Fixes Kiara's sabre belt icons, fixes armor offsets for taurs
2019-05-20 23:30:28 -07:00
Carlen White e77f30d803 Slight change for aphrodisiacs to use the new userlove style. 2019-05-21 01:39:00 -04:00
Fermi 71088eace9 More fixes 2019-05-21 05:05:32 +01:00
Fermi a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Carlen White 51f2a37e6e Changed arousal message styling.
Now with less gaudy green.
2019-05-20 17:47:10 -04:00
Fermi 773431bb8d So close..! 2019-05-20 07:46:31 +01:00
Fermi bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01:00
kevinz000 626ede8464 Merge pull request #8367 from Poojawa/genital-improvements
[READY] Genital fixes and skintone sync [Adds erections[]
2019-05-19 22:47:01 -07:00
Fermi a6ede9fecc Endless fixes 2019-05-19 23:32:30 +01:00
kevinz000 8ceec4271e Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle
Simple Mob vore toggle works again
2019-05-19 12:46:13 -07:00
Fermi 072a4ce6a6 Sleepy fixes 2019-05-19 04:20:34 +01:00
Fermi 8130a10d3a Gosh darn fixes 2019-05-19 03:39:26 +01:00
Poojawa 8dc5fccfa7 fixes darksabre stuff
adjusts naga sprite. need to make all suits transferred over.
2019-05-18 21:14:19 -05:00
Fermi 791d021d50 Even more fixes. 2019-05-19 01:37:20 +01:00
Fermi a837eda98b More fixes. 2019-05-18 22:50:20 +01:00
Fermi 0b564e7e87 Fix 2019-05-18 04:09:33 +01:00
Fermi 0700e0c080 Near completion - missing Neko's pH paper and reaction vars. 2019-05-18 03:02:14 +01:00
Fermi 2f75f861ce Explode proc set up 2019-05-18 01:19:04 +01:00
Fermi cabf490134 Fixed compiling errors for Neko. 2019-05-17 16:57:42 +01:00
kevinz000 77232cc4bb Merge pull request #8365 from Poojawa/salt-inducer
[s] Increases salt 100 fold
2019-05-17 08:34:36 -07:00
Fermi fa5531285a Push for Neko, probably doesn't compile atm. 2019-05-17 16:23:34 +01:00
Poojawa 4f75f68a5d make hostile mobs gurgle people 2019-05-17 05:13:30 -05:00
Poojawa b95bc24def mission accomplished 2019-05-17 04:24:23 -05:00
deathride58 d855a7eb0d Merge pull request #8332 from Useroth/collars-n-shit
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
2019-05-17 00:10:41 -04:00
Poojawa e4ba220eb7 oh god, oh fuck. why 2019-05-16 14:10:31 -05:00
Poojawa 0b46794ce9 Increases salt 100 fold 2019-05-16 09:43:03 -05:00
Poojawa 0f6677b956 Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
2019-05-16 08:23:53 -05:00
Fermi 538c6e98ac On-mob_life proc doesn't work for some reason. Fix it/badger helpers. 2019-05-16 01:26:46 +01:00
Fermi 246a344fed Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain) 2019-05-16 00:58:30 +01:00
Fermi 8229b4529f So sleepy 2019-05-15 05:39:07 +01:00