SandPoot
0b04af4b76
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-09-14 22:32:47 -03:00
SandPoot
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
SandPoot
1b42f5f99f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-07-08 20:20:44 -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
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -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 and GitHub
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 and GitHub
c8df97474b
Adds pick-up, drop and throw sounds for items. ( #240 )
2022-04-01 15:57:30 -03:00
SandPoot
9c42027f65
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-25 11:54:12 -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
SandPoot
3da59fc38c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-05 14:27:17 -03:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
SandPoot
be2a85d9d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-03 15:41:30 -03:00
WanderingFox95 and GitHub
678085b966
Rogue "
2021-07-21 19:42:20 +02:00
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 and GitHub
e946af558d
And somehow a word went missing.
2021-07-21 19:36:35 +02:00
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 and GitHub
53516b9f15
Tribal Tools
...
Inbetween normal and powertools
2021-07-20 18:49:40 +02:00
SandPoot
591090641e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-07-04 15:53:12 -03:00
zerothebigboy
e0a311435b
thetwentysecondofmany
2021-06-11 20:53:35 -04:00
SandPoot
c5943e474d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-23 16:58:02 -03:00
SandPoot
6c5acc3b4d
upload files
2021-02-23 16:42:07 -03:00
SandPoot
98e11d88a9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-02-21 23:29:09 -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
SandPoot
60e78f4ac7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-01-26 12:27:08 -03:00
Artur
16e0b85b44
More funshit
2021-01-20 18:23:28 +02:00
c8082e1009
Compliance with standards ( #134 )
...
* enjoy
* Update shuttles.dm
sowwy
Co-authored-by: Maksxpl <18237380+maksxpl@users.noreply.github.com >
2021-01-19 12:44:08 -03:00
SandPoot
b883a58a7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-12-25 16:41:48 -03: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
SandPoot
af0f6e7bd0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-11-18 23:12:54 -03: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 and GitHub
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
SandPoot
b77a18d6c5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-11-07 13:03:03 -03: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 and GitHub
366a605915
Update weldingtool.dm
2020-10-29 10:53:45 -04:00
Trilbyspaceclone and GitHub
a837af1436
Update weldingtool.dm
2020-10-28 12:37:50 -04:00
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
SandPoot
a7a3e6418e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-11 22:09:42 -03: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
SandPoot