fc3482ec90
Squeak!
2019-05-22 16:51:52 +01:00
7cb7f5de73
Update of master required.
2019-05-22 16:50:53 +01:00
971ddef989
reverts forensics components. If I can't figure it out, MURDER IT
2019-05-22 04:10:29 -05:00
f6f4c946e6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-05-22 00:08:13 -05:00
25463f22b2
Fixes species getting genitals at all if NOGENITAL'd
...
Holy FUCK this code is bad.
2019-05-21 23:52:19 -05:00
6bb70297ec
Why did you check if the gamemode's type is an antagonist datum?
...
And why did it sort of work too?
I don't understand.
Pooj's copypasting this black magic, smh.
2019-05-22 06:09:18 +02:00
e86585935f
MidFix - compile unsafe.
2019-05-22 02:25:05 +01:00
485def8d28
More fixed upon the last!
2019-05-21 22:06:55 +01:00
ac3f0c790e
Fixed compling errors from last time.
2019-05-21 20:28:40 +01:00
be4f188589
FermiChem? More like, FermiFixes!
2019-05-21 20:08:46 +01:00
84016ed3ef
Here we go.
2019-05-21 12:30:44 -04:00
d40d9791c4
Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41
...
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
2019-05-21 08:06:21 -04:00
a9cbcdf74e
Merge pull request #8179 from Trilbyspaceclone/BShonker
...
[Ready]Makes a blue space bike horn HONK
2019-05-20 23:40:17 -07:00
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
e77f30d803
Slight change for aphrodisiacs to use the new userlove style.
2019-05-21 01:39:00 -04:00
71088eace9
More fixes
2019-05-21 05:05:32 +01:00
a9bc75fc0e
why do I even bother
2019-05-21 02:53:17 +01:00
51f2a37e6e
Changed arousal message styling.
...
Now with less gaudy green.
2019-05-20 17:47:10 -04:00
773431bb8d
So close..!
2019-05-20 07:46:31 +01:00
bb4aecbd5f
Progressional fixes
2019-05-20 07:44:39 +01:00
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
a6ede9fecc
Endless fixes
2019-05-19 23:32:30 +01:00
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
03f129fa6e
More changes
2019-05-19 07:29:09 -04:00
072a4ce6a6
Sleepy fixes
2019-05-19 04:20:34 +01:00
8130a10d3a
Gosh darn fixes
2019-05-19 03:39:26 +01:00
8dc5fccfa7
fixes darksabre stuff
...
adjusts naga sprite. need to make all suits transferred over.
2019-05-18 21:14:19 -05:00
791d021d50
Even more fixes.
2019-05-19 01:37:20 +01:00
a837eda98b
More fixes.
2019-05-18 22:50:20 +01:00
09dfb448ed
woops
...
left that at 1 instead of 15
2019-05-18 05:51:53 -04:00
6c077758c6
ports gang
2019-05-18 05:06:22 -04:00
0b564e7e87
Fix
2019-05-18 04:09:33 +01:00
0700e0c080
Near completion - missing Neko's pH paper and reaction vars.
2019-05-18 03:02:14 +01:00
2f75f861ce
Explode proc set up
2019-05-18 01:19:04 +01:00
cabf490134
Fixed compiling errors for Neko.
2019-05-17 16:57:42 +01:00
77232cc4bb
Merge pull request #8365 from Poojawa/salt-inducer
...
[s] Increases salt 100 fold
2019-05-17 08:34:36 -07:00
fa5531285a
Push for Neko, probably doesn't compile atm.
2019-05-17 16:23:34 +01:00
4f75f68a5d
make hostile mobs gurgle people
2019-05-17 05:13:30 -05:00
b95bc24def
mission accomplished
2019-05-17 04:24:23 -05:00
50bdbcc46f
Merge branch 'master' into kevinz000-patch-41
2019-05-17 00:29:31 -04:00
ba125a2648
Merge pull request #8270 from Citadel-Station-13/kevinz000-patch-40
...
makes Eutactic (so the other energy sword) swords not strictly crappier than normal swords, makes combining them possible and makes the hyper-eutactic blade not strictly crappier than the desword
2019-05-17 00:14:36 -04:00
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
e4ba220eb7
oh god, oh fuck. why
2019-05-16 14:10:31 -05:00
0b46794ce9
Increases salt 100 fold
2019-05-16 09:43:03 -05:00
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
538c6e98ac
On-mob_life proc doesn't work for some reason. Fix it/badger helpers.
2019-05-16 01:26:46 +01:00
246a344fed
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
2019-05-16 00:58:30 +01:00
8229b4529f
So sleepy
2019-05-15 05:39:07 +01:00
6dba14eafd
Final fix.
2019-05-15 05:34:16 +01:00
aa289b67dc
Quick fix
2019-05-15 05:28:41 +01:00
Fermi