BongaTheProto
d20caf7191
Merge branch '515-update' into upstream-merge
2024-03-24 17:39:24 -05:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
SandPoot
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
BongaTheProto
1883c47d5c
basic ref regex
...
makes the proc calls compatible with 515
2024-03-11 19:46:05 -05:00
ariaworld
93f0fb7e6c
Fix a few hard-dels
2024-01-21 16:14:07 +01:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
Lin and GitHub
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
Timothy Teakettle
b4330b2f3d
GOODBYE SPECIES, HELLO COMPONENT
2022-08-05 18:19:22 +01:00
deathride58
04a0a3b869
chat blockquotes; prettier examine text and more!
2022-06-03 18:55:18 -04:00
Lin and GitHub
d7cbb017f6
Fix few instances of bleeding white blood ( #15398 )
...
* no longer bleed white blood
* parentheses man
* fix that one bdm map spawn too
2022-01-09 17:23:48 +01:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
silicons
e7981c0a44
changes
2021-02-28 01:02:18 -07:00
dzahlus
2f6527800e
monke getting wounded *pain's lmao
2021-02-18 15:55:23 +01:00
Putnam3145 and GitHub
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
DeltaFire
a07ab809ff
fixes a thing
...
Previously, if a wound was removed while there wasa surgery related to it going on, it'd just qdel() the surgery, which is.. kinda weird, since it, y'know, takes the closing step away from you, and all wound surgeries have checks for no wound being present anyways.
2020-10-31 18:04:59 +01:00
DeltaFire
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
DeltaFire
79af981467
fixes some fun limb code
2020-10-03 21:51:49 +02:00
Timothy Teakettle
e07875b356
reduces all cuts bleed rate by 25%
2020-08-05 19:11:09 +01:00
Timothy Teakettle
36d6246bc1
it is now harder to deal wounds
2020-07-26 18:54:57 +01:00
timothyteakettle
3467bf3515
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-07-26 00:25:26 +01:00
Timothy Teakettle
8b2a92994f
less rng reliance
2020-07-25 20:14:41 +01:00
timothyteakettle
315e7e1f99
bugfixes
2020-07-24 23:49:15 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
Iatots and GitHub
f53f7c5e92
Update cuts.dm
2020-07-24 07:46:09 +02:00
Iatots and GitHub
554e764be8
Update cuts.dm
...
dang speededit
2020-07-23 21:00:26 +02:00
Iatots and GitHub
a2381755e1
Update cuts.dm
...
nomenclature error
2020-07-23 20:52:29 +02:00
Iatots and GitHub
9d89158fda
Update cuts.dm
2020-07-23 19:48:41 +02:00
Timothy Teakettle
f5ac0b5762
some fixes
2020-07-23 18:10:46 +01:00
Timothy Teakettle
aea268548c
some fixes
2020-07-21 19:54:42 +01:00
Timothy Teakettle
037cec508e
fixes a math mistake
2020-07-19 21:43:17 +01:00
Timothy Teakettle
fe79c53f04
bugfixes
2020-07-18 21:40:19 +01:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
timothyteakettle
7714fcfaba
more changes
2020-07-18 01:26:38 +01:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
BongaTheProto