SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
SandPoot
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
SandPoot
33bfcf67b5
solves missing keyword args
2022-07-03 01:37:26 -03:00
SandPoot
09e351277a
this
2022-07-03 01:28:39 -03:00
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
DeltaFire
a8ff45ca16
fix
2022-03-22 18:05:58 +01:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
WanderingFox95
678085b966
Rogue "
2021-07-21 19:42:20 +02:00
WanderingFox95
f54f35ce40
Turns out copypasting tool descriptions is silly again. Oops.
...
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com >
2021-07-21 19:38:53 +02:00
WanderingFox95
e946af558d
And somehow a word went missing.
2021-07-21 19:36:35 +02:00
WanderingFox95
8ac706a1e7
Turns out copypasting tool descriptions is silly. Oops.
...
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com >
2021-07-21 19:35:48 +02:00
WanderingFox95
53516b9f15
Tribal Tools
...
Inbetween normal and powertools
2021-07-20 18:49:40 +02:00
zerothebigboy
e0a311435b
thetwentysecondofmany
2021-06-11 20:53:35 -04:00
SandPoot
6c5acc3b4d
upload files
2021-02-23 16:42:07 -03:00
SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
Artur
16e0b85b44
More funshit
2021-01-20 18:23:28 +02:00
DeltaFire
7da2f871d0
corrects comment
2020-12-23 03:02:42 +01:00
DeltaFire
8a5cdddb67
actually increases brass welder refueling speed
2020-12-23 02:57:01 +01:00
DeltaFire
4d4d0e9ec3
a fix fix
2020-12-23 02:50:15 +01:00
Putnam3145
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
silicons
a950bcb0fb
Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
...
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
DeltaFire
c4b0f21fd2
buncha stuff
...
All tools now have the surgical tool flag (save for wires since those have force 0 anyways and are only used very rarely in surgery), but yeah, since we got far more species using robot surgeries (0 -> 3), might be good to not have them accidentally beaten up.
Also fixes organs being eaten after inserting them, yay!
2020-11-04 04:34:56 +01:00
Trilbyspaceclone
366a605915
Update weldingtool.dm
2020-10-29 10:53:45 -04:00
Trilbyspaceclone
a837af1436
Update weldingtool.dm
2020-10-28 12:37:50 -04:00
Trilbyspaceclone
bb155f8784
Apply suggestions from code review
...
Grammar
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com >
2020-10-24 07:25:27 -04:00
Trilby
8fa595ccea
Makes welder code better*
2020-10-21 05:50:41 -04:00
DeltaFire
4f734f68a9
moves damage checks
...
title. Makes it harder to circumvent them.
2020-10-11 16:18:25 +02:00
DeltaFire
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
silicons
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
DeltaFire
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
Timothy Teakettle
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
silicons
1b1efce556
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-06 17:11:21 -07: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
silicons
1ea0dd9f76
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-19 15:56:13 -07:00
Timothy Teakettle
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
silicons
0a36f9fbb5
changes
2020-08-04 22:40:28 -07:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
SiliconMain
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
Timothy Teakettle
75c40f6d93
what if wound values didnt suck
2020-07-26 18:51:19 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
kappa-sama
1f38c3029c
yeah ok
2020-07-01 07:40:43 -04:00
Timothy Teakettle
6ad72e6972
better limb healing
2020-06-05 15:41:52 +01:00
