Commit Graph

20821 Commits

Author SHA1 Message Date
Fermi
c1544ffe46 Tweak. 2019-05-29 01:57:31 +01:00
Fermi
db3369ab43 Scrubbing messages and cleaning code. 2019-05-29 01:51:07 +01:00
Fermi
331c2887ea Small recipie changes. 2019-05-29 01:41:30 +01:00
Fermi
543dc9a399 Final fixes, finally fixed all problems. 2019-05-29 01:33:07 +01:00
Fermi
12eb5e9b17 ARGH 2019-05-28 23:35:50 +01:00
Fermi
89665de8a7 Last round of test checks. 2019-05-28 22:33:04 +01:00
Fermi
48ae55d61d Sishen implementation 2019-05-28 19:25:31 +01:00
Thalpy
4f28dbd7fc Lil clarification. 2019-05-28 18:44:14 +01:00
Thalpy
7ab4cbeedc Library pls 2019-05-28 18:42:39 +01:00
Fermi
8282819c84 CHECK PLASMA THOUGH! 2019-05-28 05:03:58 +01:00
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
CitadelStationBot
851072ff23 Automatic changelog generation for PR #8325 [ci skip] 2019-05-25 13:51:21 -05:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118
[Ready] Cleaner looking autolathen organization
2019-05-25 11:51:17 -07:00
CitadelStationBot
b6abfeb1fc Automatic changelog generation for PR #8417 [ci skip] 2019-05-25 13:34:59 -05:00
kevinz000
90a3199315 Merge pull request #8417 from Trilbyspaceclone/patch-136
Gives space queen's men void jet packs + tweeks
2019-05-25 11:34:55 -07:00
CitadelStationBot
bc8b4485e0 Automatic changelog generation for PR #8413 [ci skip] 2019-05-25 13:32:26 -05:00
kevinz000
d0f61c5f41 Merge pull request #8413 from Useroth/hotel-dorms
Boltable hotel dorms. Now with mapmerge. Also the hotel booze-o-mat doesn't require access anymore.
2019-05-25 11:32:23 -07:00
CitadelStationBot
34bc572dd6 Automatic changelog generation for PR #8296 [ci skip] 2019-05-25 13:31:33 -05:00
kevinz000
a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112
Nerfs Synda NPC block Rng to 25%
2019-05-25 11:31:30 -07:00
CitadelStationBot
38304ca471 Automatic changelog generation for PR #8384 [ci skip] 2019-05-25 13:31:00 -05:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
CitadelStationBot
d1cdf35007 Automatic changelog generation for PR #8397 [ci skip] 2019-05-25 13:30:21 -05: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
CitadelStationBot
dd2259c11c Automatic changelog generation for PR #8399 [ci skip] 2019-05-25 13:29:24 -05:00
kevinz000
aeace88306 Merge pull request #8399 from Poojawa/doctor-chemistry
Large Maps given an Apothecary
2019-05-25 11:29:20 -07:00
CitadelStationBot
e4b9fe7359 Automatic changelog generation for PR #8398 [ci skip] 2019-05-25 13:28:43 -05:00
kevinz000
deffcb3226 Merge pull request #8398 from BurgerLUA/AntiAssSlap
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
2019-05-25 11:28:39 -07:00
CitadelStationBot
83f65f248d Automatic changelog generation for PR #8407 [ci skip] 2019-05-25 13:20:26 -05:00
kevinz000
aab5a4ae0a Merge pull request #8407 from Poojawa/sprite-fixing
Female Gendered markings and leg sprite fixes
2019-05-25 11:20:23 -07:00
kevinz000
e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread
Defibrillator Upgrades Proofread
2019-05-25 11:17:34 -07:00
CitadelStationBot
2bc0caa7fe Automatic changelog generation for PR #8409 [ci skip] 2019-05-25 13:13:58 -05: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
kevinz000
16310a9aea Merge pull request #8425 from BlackMajor/Dunga
Ports TG firebots.
2019-05-25 11:13:29 -07:00
CitadelStationBot
3bf6c84779 Automatic changelog generation for PR #8420 [ci skip] 2019-05-25 13:10:22 -05:00
kevinz000
104d3c1f37 Merge pull request #8420 from deathride58/fixesblobs
Fixes shield blobs being completely invulnerable to all forms of damage after reaching a weakened state.
2019-05-25 11:10:19 -07:00
Fermi
e3d3f30ea9 Could this be the final commit?! 2019-05-25 16:12:46 +01:00
Fermi
4b8cb81752 Compile safe. 2019-05-25 05:35:03 +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