Commit Graph

40504 Commits

Author SHA1 Message Date
DeltaFire
032c169098 whoops 2021-01-12 23:29:51 +01:00
DeltaFire
13beddd42b nanogel time 2021-01-12 23:02:44 +01:00
CitadelStationBot
f40955f6dc Automatic changelog generation for PR #14026 [ci skip] 2021-01-12 02:20:52 -06:00
silicons
09772543b9 Merge pull request #14026 from BlueWildrose/SkidoodleSkidaddle
Skidaddle skidoodle, your 12+ inch dick no longer looks like a noodley elephant trunk
2021-01-12 01:20:49 -07:00
BlueWildrose
19078449fe Merge branch 'master' into SkidoodleSkidaddle 2021-01-11 20:26:21 -07:00
DeltaFire
63aaac873f Merge pull request #13973 from Citadel-Station-13/shitcode
completely removes penis/breast enlargement effects due to it being completely unmaintained and to be frank awful
2021-01-12 01:30:24 +01:00
Lin
9d4b30d4e9 Merge pull request #14023 from Citadel-Station-13/silicons-patch-8
the disk now snores every minute instead of every 2 seconds
2021-01-12 00:01:44 +00:00
Blue Wildrose
b4fbeddda9 Probably makes more sense 2021-01-11 00:12:13 -07:00
Blue Wildrose
4ec834c3dd your dick is no longer a big fat noodle 2021-01-11 00:00:48 -07:00
Lin
95101ac36a Merge pull request #14013 from Citadel-Station-13/compressor
lets science actually print explosive compressors
2021-01-11 00:21:11 +00:00
Lin
f4c4e0721b Merge pull request #14012 from Citadel-Station-13/silicons-patch-6
fixes colormate last_matrix saving (again)
2021-01-10 19:36:47 +00:00
silicons
cd62c45902 Update nuclearbomb.dm 2021-01-10 03:52:16 -07:00
CitadelStationBot
e998fd4e34 Automatic changelog generation for PR #13993 [ci skip] 2021-01-10 02:36:46 -06:00
silicons
72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks
Makes cursed heart more tolerable
2021-01-10 01:36:43 -07:00
Putnam3145
07399d2c93 Merge pull request #13949 from Citadel-Station-13/silicons-patch-60
clamps cyborg sprint to 10 tiles/second and fixes them going methspeed
2021-01-09 22:16:14 -08:00
CitadelStationBot
1265995f60 Automatic changelog generation for PR #14014 [ci skip] 2021-01-09 20:49:13 -06:00
silicons
121104ca6c Merge pull request #14014 from necromanceranne/bokken_fixes_2
Bokken Fixes 2: Missing sprites and stuff
2021-01-09 19:49:10 -07:00
DeltaFire
eac7959f01 Merge pull request #14017 from Citadel-Station-13/silicons-patch-7
fixes stabilized oil extracts making infinite explosions
2021-01-10 02:22:40 +01:00
silicons
fd77be9b89 Update _status_effects.dm 2021-01-09 16:44:56 -07:00
CitadelStationBot
b50c23a82a Automatic changelog generation for PR #13965 [ci skip] 2021-01-09 16:39:08 -06:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-01-09 15:39:06 -07:00
CitadelStationBot
185a57cd5d Automatic changelog generation for PR #13995 [ci skip] 2021-01-09 16:38:10 -06:00
silicons
fffafff5d3 Merge pull request #13995 from DeltaFire15/xeno-clickdelay
(Somewhat) fixes clickdelay when attacking objects.
2021-01-09 15:38:07 -07:00
CitadelStationBot
4d64026a88 Automatic changelog generation for PR #14006 [ci skip] 2021-01-09 16:37:48 -06:00
silicons
22a32d25b4 Merge pull request #14006 from DeltaFire15/borg-shell-dupe
Attempting to complete a borg AI shell without a cell installed no longer causes issues
2021-01-09 15:37:45 -07:00
CitadelStationBot
b453799918 Automatic changelog generation for PR #14007 [ci skip] 2021-01-09 16:37:38 -06:00
silicons
3db556b9b7 Merge pull request #14007 from DeltaFire15/heretic-spec-role-fix
Fixes heretic special role adding / removal
2021-01-09 15:37:35 -07:00
CitadelStationBot
1d2928ad52 Automatic changelog generation for PR #14008 [ci skip] 2021-01-09 16:37:21 -06:00
silicons
2bf5a0e91e Merge pull request #14008 from TheSpaghetti/patch-5
Removes double punctuation in the tumor bread description.
2021-01-09 15:37:19 -07:00
CitadelStationBot
b0f0d52bd9 Automatic changelog generation for PR #14010 [ci skip] 2021-01-09 16:36:31 -06:00
silicons
778be450f1 Merge pull request #14010 from shellspeed1/fixes-missing-organs-in-tech-fab
Fixes some missing upgraded cybernetic organs in the exofab and also makes prosthetic limbs printable at them.
2021-01-09 15:36:28 -07:00
silicons
c36151b4cf Update machine_designs_sci.dm 2021-01-09 15:35:26 -07:00
CitadelStationBot
562dbd5802 Automatic changelog generation for PR #14016 [ci skip] 2021-01-09 16:34:08 -06:00
silicons
8664c2c624 Merge pull request #14016 from timothyteakettle/preference-coders-are-bad
disabling adminhelp noises no longer disables looc
2021-01-09 15:34:06 -07:00
Timothy Teakettle
d459f6db91 Update looc.dm 2021-01-09 21:30:18 +00:00
necromanceranne
d7d342cc75 Back sprites as well 2021-01-10 05:48:27 +11:00
necromanceranne
6d10ca9efa Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts 2021-01-10 05:43:33 +11:00
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs
low level reagent logging additions
2021-01-09 16:24:40 +00:00
Lin
eb300481c4 Merge pull request #14002 from Citadel-Station-13/silicons-patch-5
removes glitter persistence
2021-01-09 16:12:33 +00:00
silicons
b0a94a6e1c Update engineering_nodes.dm 2021-01-09 07:30:14 -07:00
silicons
34c5d99afb Update machine_designs_sci.dm 2021-01-09 07:29:31 -07:00
silicons
9fec00621e Update colormate.dm 2021-01-09 06:43:55 -07:00
shellspeed1
04d60c85d9 a 2021-01-09 03:06:48 -08:00
TheSpaghetti
b52e8bf447 double punctuation bad
no
2021-01-09 00:18:15 -05:00
CitadelStationBot
23dfce7d5b Automatic changelog generation for PR #14005 [ci skip] 2021-01-08 19:09:39 -06:00
silicons
536ae34ea7 Merge pull request #14005 from DeltaFire15/AAAAAAAAAAAAA
Stops mob loot from failing to Initialize
2021-01-08 18:09:36 -07:00
DeltaFire
9cfd3c073e smol fix 2021-01-09 00:33:20 +01:00
DeltaFire
23c5f1744d actually 2021-01-09 00:12:10 +01:00
DeltaFire
4f3df626c6 no cell no problem 2021-01-09 00:09:17 +01:00
DeltaFire
56a2892fd3 sigh 2021-01-08 23:48:32 +01:00