Commit Graph

2209 Commits

Author SHA1 Message Date
DeltaFire
051f5780db tweaks
Synthtissue borrowed health capped at 250, gradually flips from clonedamage towards toxdamage within 45 cycles.

Restores organ healing for strange reagent, but only in a very weak fashion (5 heal for failing organs)
2021-12-31 00:16:49 +01:00
DeltaFire
64367ff7ba edge case protection 2021-10-02 18:33:57 +02:00
DeltaFire
9f3688f9cc health payback affected by metabolism 2021-09-25 02:32:29 +02:00
DeltaFire
31679157dc adjust 2021-09-25 02:24:12 +02:00
DeltaFire
6cffeacd42 typo 2021-09-22 23:32:35 +02:00
DeltaFire
2e2aa36875 grab the ghost 2021-09-22 22:47:08 +02:00
DeltaFire
7752e0d624 synthtissue and sr 2021-09-22 22:30:43 +02:00
BlueWildrose
af94680c7d this probably sounds better 2021-08-22 14:45:18 -07:00
BlueWildrose
d117a9b662 woops, that actually was needed. 2021-08-19 04:41:18 -07:00
BlueWildrose
48b2877fab unhornys the MK ultra gas 2021-08-19 04:25:54 -07:00
BlueWildrose
f5688b1ed0 bring back old smoke effect 2021-08-19 01:47:00 -07:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
silicons
8b09d98361 Merge pull request #14978 from Citadel-Station-13/mgas-dontoar
Adds military gas mask for donator
2021-08-08 04:08:37 -07:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
silicons
f327592784 Update __donator.dm 2021-08-04 00:51:37 -07:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Jay
a88e83e579 Adds military gas mask for donator 2021-08-01 18:42:43 -05:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam3145
975582380b always search when you change paths 2021-07-25 18:52:01 -07:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons
8710731b87 tweaks 2021-07-01 20:42:55 -07:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
WanderingFox95
9cdc45a905 Bit of this 2021-06-02 15:27:47 +02:00
WanderingFox95
b563e6c2e0 Splits Engineering and Security ORV Suits 2021-06-02 15:25:50 +02:00
Lin
8d9571b863 Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix
Igiari Donator Item fix
2021-05-23 14:16:59 -05:00
Igiari
ad6b6b29a0 I'm dumb 2021-05-20 20:08:07 -05:00
Igiari
1485b2fab5 I was told to do this too 2021-05-18 20:19:34 -05:00
Igiari
3de1291dcf Good suggest.
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-05-18 17:45:55 -05:00
Igiari
27a779da01 It was supposed to be a uniform all along
Fine, I'll fix it myself
2021-05-18 13:02:45 -05:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
silicons
cd0a0bbe5c Update healing.dm 2021-05-06 03:02:46 -07:00
Artur
35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
silicons
cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
2021-04-28 21:17:55 -06:00
The0bserver
87eee1e15e Why do I do this to myself at 2:22 AM 2021-04-24 02:22:43 -04:00
The0bserver
00f50713eb The fault in my stars 2021-04-24 02:04:21 -04:00
The0bserver
42ed17d2af this too 2021-04-24 00:54:56 -04:00
The0bserver
c7b231637e boxes of ammo, also fire not weapon is bullet 2021-04-24 00:53:57 -04:00
The0bserver
aebca1767e In a station full of bad ideas, these costs were.. 2021-04-23 23:20:16 -04:00
necromanceranne
0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
Blue Wildrose
a7726aa383 re-enlarging the value 2021-04-01 06:07:25 -07:00
Blue Wildrose
e7099c67a1 oh right some fucker at cargo would abuse this. 2021-04-01 05:45:26 -07:00
silicons
d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr
the loadout now recognises collars as polychromic items
2021-03-24 19:23:58 -06:00
Timothy Teakettle
7d4284b086 Update neck.dm 2021-03-23 21:33:50 +00:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
silicons
7bd2727d58 Merge pull request #14458 from GrayRachnid/particle-defender
Buffs the Warden's Particle defender to something that isn't pure dumpster trash
2021-03-20 14:28:26 -06:00
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00