cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-29 03:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,908 Commits 55 Branches 0 Tags
5029af901b173475bb4d5ce480e89f0ca87d3d3b
Commit Graph

167 Commits

Author SHA1 Message Date
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
DeltaFire
97eb42b35b defib policy hook & oxyheal 2021-10-04 15:49:12 +02: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
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Artur
d185c5a3e9 Re-adds the badmin nanite hub 2021-07-28 02:13:24 +03:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
Artur
5619b73e6b Makes it actually, actually work 2021-06-16 02:02:28 +03:00
Artur
ad0c3d477e Makes it work proper, hopefully 2021-06-16 01:48:54 +03:00
Artur
795ab3f835 https://github.com/tgstation/tgstation/pull/49798 2021-06-16 01:32:24 +03:00
Artur
096e7d4d67 https://github.com/tgstation/tgstation/pull/49927 2021-06-16 01:31:53 +03:00
Artur
fbcd1a3026 https://github.com/tgstation/tgstation/pull/55883 
With a minor tweak so humans don't benefit
 2021-06-16 01:26:02 +03:00
Artur
ab82766757 https://github.com/tgstation/tgstation/pull/59169 2021-06-16 01:19:48 +03:00
Artur
74c186d871 https://github.com/tgstation/tgstation/pull/56516 2021-06-16 01:16:39 +03:00
Artur
a430dc4d4d https://github.com/tgstation/tgstation/pull/56542 2021-06-16 01:16:08 +03:00
Artur
f3e16b298b https://github.com/tgstation/tgstation/pull/56588 2021-06-16 01:15:21 +03:00
Artur
b0d7482f04 https://github.com/tgstation/tgstation/pull/55902 2021-06-16 01:09:30 +03:00
Artur
e2eb9d52d0 https://github.com/tgstation/tgstation/pull/55164 2021-06-16 01:03:51 +03:00
Artur
18aee24231 https://github.com/tgstation/tgstation/pull/54902 2021-06-16 01:01:41 +03:00
Artur
337998e99a https://github.com/tgstation/tgstation/pull/54793 2021-06-16 00:46:05 +03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
silicons
cb52be5dd9 fixes linter warnings (#14778) 
* woo

* woo
 2021-05-31 10:19:20 -05: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
silicons
8f36a1d2ec okay 2020-11-22 15:20:52 -07:00
silicons
13ebceb670 why did i do this 2020-11-22 14:56:02 -07:00
silicons
c7e60191df whew 2020-11-22 14:44:05 -07:00
silicons
5ae410790b locking 2020-11-22 14:40:57 -07:00
silicons
37e26833a6 wew 2020-11-22 14:16:14 -07:00
Putnam3145
f6b93a242c Makes get_damaged_bodyparts use proper arguments (#13570) 
* you're not being clever, you're being obfuscatory, stop this

* Made get_damaged_bodyparts use proper arguments

* Actually shouldn't have the arg
 2020-10-17 11:44:15 +02: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
Timothy Teakettle
58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
silicons
5414a8949c Update text.dm 2020-08-19 08:50:26 -07:00
silicons
ce80f64d27 Update suppression.dm 2020-08-18 18:52:06 -07:00
Lin
b8ba29e6f8 Merge pull request #13117 from Citadel-Station-13/silicons-patch-3 
fixes nanite hubs
 2020-08-14 13:01:15 -05:00
Lin
ba9a808aaa Merge pull request #13118 from Citadel-Station-13/silicons-patch-4 
fixes nanite programmers not ejecting disks
 2020-08-14 13:01:08 -05:00
silicons
b931b450ac Update nanite_cloud_controller.dm 2020-08-12 17:18:56 -07:00
silicons
bb29d85983 Update nanite_programmer.dm 2020-08-12 17:18:40 -07:00
silicons
cd95685eaa Update nanite_program_hub.dm 2020-08-12 17:18:06 -07:00
silicons
7bcbcda37b Update nanite_cloud_controller.dm 2020-08-11 00:37:44 -07:00
silicons
471d036881 Update nanite_programmer.dm 2020-08-11 00:35:53 -07:00
silicons
e99414c3d4 Update nanite_program_hub.dm 2020-08-11 00:34:17 -07:00
Letter N
e964b3aabf skillpannel fix, and nyanite fixes. Minified js does not include pai spoilers 2020-08-08 20:04:16 +08:00
Letter N
83207baaee reverts nanite thing 2020-08-08 16:30:07 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00