Commit Graph

771 Commits

Author SHA1 Message Date
Fermi
df2a14880e Beginning comment purge. 2019-05-28 00:35:33 +01:00
Fermi
5771fd9442 Should be the last fix. 2019-05-27 20:52:05 +01:00
Fermi
79a7b6b45b Fixes. 2019-05-27 20:25:57 +01:00
Fermi
c531e6afa6 Okay, forgot to stage changes. Now compile safe. 2019-05-27 15:03:29 +01:00
Fermi
a1afeb880f Final testing. Added pH meter too. Compile safe. 2019-05-27 15:00:19 +01:00
Fermi
4607a2b6c3 Compile safe. Today's fixes. 2019-05-27 05:39:52 +01:00
Fermi
4cb697d2ec Final changes before checks. 2019-05-26 17:37:20 +01:00
Fermi
bd85095590 Prebed tweaks 2019-05-26 05:34:28 +01:00
Fermi
91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
Fermi
87deaf07c5 Update breasts.dm
I do not like how git works sometimes.
2019-05-26 01:55:59 +01:00
Fermi
a0073295e1 Updating from Cit, pre PR. 2019-05-26 01:49:58 +01:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118
[Ready] Cleaner looking autolathen organization
2019-05-25 11:51:17 -07:00
kevinz000
e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes
Changed arousal message styling.
2019-05-25 11:30:18 -07:00
kevinz000
97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad
Fixes species getting genitals at all if NOGENITAL'd
2019-05-25 11:13:55 -07:00
Fermi
e3d3f30ea9 Could this be the final commit?! 2019-05-25 16:12:46 +01:00
Fermi
e2c1eb1d7c prebed fixes 2019-05-25 05:27:28 +01:00
Fermi
b4624c5537 I really hate genitals. 2019-05-25 03:15:15 +01:00
Fermi
5e8a20b171 More bugs, to be fixed. 2019-05-25 03:00:31 +01:00
Fermi
faf6585b69 Winding down to the final commits. 2019-05-25 01:04:00 +01:00
Fermi
05aaeb4d70 Current state 2019-05-24 06:06:25 +01:00
Fermi
b1c11071de Fixed acid to water and funbits. 2019-05-24 01:50:33 +01:00
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
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
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