Commit Graph

1136 Commits

Author SHA1 Message Date
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons
b1b931a7c4 Update _bodyparts.dm 2021-05-27 22:48:24 -07:00
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
keronshb
6e3e075ff9 Oops forgot something 2021-05-12 13:14:54 -04:00
keronshb
fa067a481a Removes VOG sleep command again
Undocumented change.
2021-05-12 13:09:39 -04:00
Timothy Teakettle
60673d9c5c AAAAAA 2021-05-10 17:13:24 +01:00
Timothy Teakettle
cfcbaa001b fixes 2021-05-10 14:31:36 +01:00
Timothy Teakettle
d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
timothyteakettle
bb893383bc Update _bodyparts.dm 2021-05-07 17:27:55 +01: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
Timothy Teakettle
cb98cbd19f colour backend 2021-04-28 22:33:05 +01:00
Timothy Teakettle
72a009dc7c based? 2021-04-28 19:31:20 +01:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
Timothy Teakettle
371b250623 unused var 2021-04-25 13:24:04 +01:00
Timothy Teakettle
f243c6b7c4 makes them apply properly 2021-04-25 13:23:16 +01:00
timothyteakettle
97e18833d5 better debug info 2021-04-25 00:07:59 +01:00
Timothy Teakettle
fce471cabb debug messages 2021-04-24 23:40:55 +01:00
Timothy Teakettle
ec41b301c7 a 2021-04-24 18:55:07 +01:00
Timothy Teakettle
e89b05cfdd oh dear 2021-04-23 21:13:32 +01:00
necromanceranne
ff866f3f9d Changes emp_vulnerability from the probably to the division of the emp severity. Higher is better. 2021-04-23 12:17:13 +10:00
necromanceranne
c924d47911 brings the values down even further 2021-04-22 13:13:10 +10:00
necromanceranne
0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10:00
silicons
74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
2021-04-18 19:02:53 -06:00
DeltaFire
d4d9fef82c oop 2021-04-16 16:06:34 +02:00
silicons
a367a057e4 Merge pull request #14562 from BlueWildrose/poppinoff
Buffs the genetic mutation Autotomy
2021-04-08 03:23:22 -06:00
Blue Wildrose
cd81345e9f Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE 2021-04-07 15:00:09 -07:00
Blue Wildrose
3cf25a8cc7 Slimeperson organs are now more confusing 2021-04-06 23:10:23 -07:00
DrPainis
29451ee9ae organic repair surgery can be done on a cyborg torso (#14435)
* repair surgery can be done on a cyborg torso

because no

* uuuuhhhh Silicons asked me to do this

* no organic repair surgery on robots
2021-04-04 00:18:43 +02:00
Blue Wildrose
49c3284f16 linters quit complaining. 2021-04-03 12:45:52 -07:00
Blue Wildrose
d55bb8231d Buffs autotomy 2021-04-03 10:55:34 -07:00
silicons
4f3e695afa Merge pull request #14495 from Hatterhat/synth-aug
is it really an augmentation if you're using a synthflesh-grown limb? no, probably not, but what if you could
2021-03-27 01:35:54 -06:00
Timothy Teakettle
6536dc4ecd Update _bodyparts.dm 2021-03-25 18:24:57 +00:00
Timothy Teakettle
f113844c41 Update _bodyparts.dm 2021-03-25 18:22:56 +00:00
Hatterhat
e5c01bc0f8 limbgrower limbs can be used in augmentations 2021-03-22 20:15:01 -05:00
silicons
02b52e6142 framework 2021-03-20 16:02:26 -07:00
silicons
15dd80a085 less awful 2021-03-20 13:39:59 -07:00
silicons
5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -07:00
silicons
5a9fc99aba Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
2021-03-12 19:40:02 -07:00
Hatterhat
48de811919 fucking finally holy shit 2021-03-11 19:10:23 -06:00
Letter N
e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Hatterhat
80469a32f9 WHY WON'T YOU HIDE CORRECTLY 2021-03-01 22:33:21 -06:00
silicons
0f35f01a9b changes 2021-02-28 00:58:13 -07:00
SandPoot
08d19e349f Update code/modules/surgery/advanced/toxichealing.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2021-02-26 10:06:53 -03:00
SandPoot
ccc50ff9ce upload toxichealing.dm 2021-02-24 20:47:46 -03:00
Hatterhat
24407b9768 time to set this up as a reminder 2021-02-24 14:58:57 -06:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00