Commit Graph

20281 Commits

Author SHA1 Message Date
deathride58
ace4eb6c8d [S] blocks a freshly rediscovered aimbot exploit 2022-05-26 20:03:03 -04:00
Lin
f4dca7caa6 Merge pull request #15631 from timothyteakettle/genitals-get-optimised
optimises genital/tail organs by returning when calling on_life
2022-05-20 19:51:56 +00:00
silicons
fd7b64c886 Merge pull request #15625 from Citadel-Station-13/Linzolle-patch-1
Allow numbers in character names
2022-05-20 12:36:48 -07:00
silicons
1fc41baf59 Merge pull request #15630 from SandPoot/flavor-text-changes
Makes flavor texts a tiny bit better
2022-05-20 12:36:40 -07:00
Lin
b22ffa4789 Merge pull request #15627 from timothyteakettle/a-slight-slime-nerf
makes blunt wound damage to BIO_ONLY_FLESH convert at the same rate as slash wound damage to BIO_ONLY_BONE
2022-05-19 21:37:03 +00:00
Timothy Teakettle
b245a3d6b8 yes 2022-05-19 20:28:38 +01:00
SandPoot
da1f58f297 Update files 2022-05-19 13:23:17 -03:00
Lin
e8947a4e4d Merge pull request #15624 from timothyteakettle/better-quirk-menu
quirks are now organised into three tabs for positive, neutral and negative
2022-05-18 03:29:07 +00:00
Lin
9d86c5402a Merge pull request #15626 from SandPoot/emotes
Minor touches on emotes
2022-05-18 03:27:08 +00:00
Timothy Teakettle
275b4ebedd Update _bodyparts.dm 2022-05-17 13:50:23 +01:00
SandPoot
5dad84a486 Update files 2022-05-16 21:44:25 -03:00
Lin
b6f176dd8d allow numbers in character names 2022-05-16 13:44:01 -07:00
Timothy Teakettle
1c9f6077da loadout organisation 2022-05-16 21:22:22 +01:00
Timothy Teakettle
924bca64d1 Update preferences.dm 2022-05-16 16:38:50 +01:00
silicons
dc88c32c77 Update inventory.dm 2022-05-15 13:53:25 -07:00
silicons
ffe0a0a9e7 Update inventory.dm 2022-05-15 13:53:07 -07:00
silicons
26f6e92e70 Update inventory.dm 2022-05-15 13:52:33 -07:00
Lin
a899b5db81 Merge pull request #15607 from Putnam3145/auxmos-1
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00
Lin
95416bbedc Merge pull request #15587 from TomGarou/Synth-Brainwashing
Synth Brainwashing AKA Reprogramming
2022-05-12 20:29:04 +00:00
Lin
4771754343 Merge pull request #15611 from LiteralMushroom/patch-5
Alter form for wings.
2022-05-12 20:12:22 +00:00
Lin
dec7751f95 Merge pull request #15612 from SandPoot/status_displays
Syncs status displays to tg's version
2022-05-12 20:11:54 +00:00
LiteralMushroom
cfce371c8a You can now actually select a wing color. 2022-05-11 16:06:17 -04:00
LiteralMushroom
e59824fe26 in different files? 2022-05-09 19:32:13 -04:00
LiteralMushroom
626ab0fb2b why are these 2022-05-09 19:29:32 -04:00
SandPoot
90eab441aa Upload files 2022-05-09 18:50:17 -03:00
LiteralMushroom
dd4aa993df wings/deco_wings isn't a real category
fuck
2022-05-07 15:10:27 -04:00
LiteralMushroom
ccd9a19356 actual option 2022-05-07 15:05:39 -04:00
LiteralMushroom
73f1417eef first commit (probably doesn't work) 2022-05-07 15:04:06 -04:00
silicons
73741102ac Merge pull request #15606 from timothyteakettle/salt-quirk
an actual salt pr (adds sodium sensitivity quirk)
2022-05-02 17:02:23 -07:00
Putnam3145
171fd771f9 Fixes bad alpha stuff (why?) 2022-04-29 23:53:55 -07:00
Putnam3145
5ea144b9f9 forgot to give hydrogen a color 2022-04-28 21:16:54 -07:00
Putnam3145
a7408beb4c Updated auxmos to 1.0 2022-04-28 21:07:51 -07:00
silicons
ce7d7a5124 Merge pull request #15594 from SandPoot/stasis-beds-update
Makes stasis beds *slightly* less hated
2022-04-27 16:11:34 -07:00
silicons
004e91c743 Merge pull request #15602 from Putnam3145/lavaland-more-atmos
Allow planets to have fuel-based atmospheres
2022-04-27 16:11:15 -07:00
Timothy Teakettle
ac4a41243a add salt quirk 2022-04-27 14:58:54 +01:00
Putnam3145
6c04b27a52 Use adjust_heat
it came to me in a dream
2022-04-26 13:58:22 -07:00
Putnam3145
2d6e4aa769 Gas addition already weights by spec heat 2022-04-26 13:57:17 -07:00
Putnam3145
b5ce67ce55 Weird reaction stuff 2022-04-26 01:14:41 -07:00
Putnam3145
3055cfa3c6 Adds methane, methyl bromide to default scrubber 2022-04-25 21:58:06 -07:00
Putnam3145
57d24edcf2 I forgot to compile 2022-04-25 21:07:44 -07:00
Putnam3145
621b974691 Allow planets to have fuel-based atmospheres 2022-04-25 20:27:01 -07:00
silicons
be5a476aaf fixes being unable to access own notes (#15599)
* Update sql_message_system.dm

* not webeditting

Co-authored-by: DeltaFire <andreoxgrievous@gmail.com>
2022-04-16 04:35:56 +02:00
silicons
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs
Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
silicons
13f326c939 Merge branch 'master' into Synth-Brainwashing 2022-04-15 17:44:30 -07:00
silicons
e67340f147 Merge pull request #15590 from SandPoot/noisy-surgery
Adds sound effects to surgeries
2022-04-15 17:43:37 -07:00
silicons
c3ef3e7b69 Merge pull request #15588 from SandPoot/save-or-your-progress-will-be-lost
Fixes saving testicle shapes
2022-04-15 17:43:08 -07:00
silicons
a1268032d6 Merge pull request #15593 from Putnam3145/fix-linux
Makes auxmos do fires on Linux
2022-04-15 17:42:05 -07:00
silicons
da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
SandPoot
13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02:00
BlueWildrose
f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053)
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2022-04-15 00:37:08 +02:00