d2f3ff4d11
Update holy_weapons.dm
2021-09-12 20:23:00 -07:00
57b6946fbb
Update holy_weapons.dm
2021-09-12 20:18:48 -07:00
037f466a47
Update holy_weapons.dm
2021-09-12 20:12:31 -07:00
aa7a376dd5
removes DoT
2021-09-12 20:10:01 -07:00
7aae90a360
Update holy_weapons.dm
2021-09-12 20:05:47 -07:00
baa8d26428
Update holy_weapons.dm
2021-09-12 20:03:26 -07:00
c038529677
Update holy_weapons.dm
2021-09-12 19:55:20 -07:00
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
c600fae409
Merge pull request #15103 from SandPoot/cyborg-grippers
...
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
52029c6067
Update stunbaton.dm
2021-09-08 20:53:52 -07:00
5bf71cdcc8
Update stunbaton.dm
2021-09-08 20:43:10 -07:00
69bd477a72
Merge pull request #15039 from keronshb/gradiantport
...
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
37e2470616
Upload files
2021-09-08 19:53:47 -03:00
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
70b0dad62d
Update glass.dm
2021-09-07 03:26:39 -04:00
e53223a149
unversioned
2021-09-02 23:50:38 -04:00
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
30134a0d2f
cool
2021-09-01 06:32:33 -04:00
fe90ea3ef4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into headass
2021-09-01 05:14:27 -04:00
0e95e1a8ad
cool
2021-09-01 05:14:17 -04:00
47078e9a85
Ports Hair Gradiants
2021-08-26 11:58:09 -04:00
e7b6c9ab5e
Catwalk Flooring
2021-08-22 22:41:48 -04:00
06181f51ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
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
59e541d2e7
Merge pull request #14971 from Arturlang/nanite_updates
...
Ports update appearance
2021-08-08 04:06:18 -07:00
5acd7fef2d
makes salglu not deadly
2021-08-02 21:54:47 +03:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
30016f38a8
compiles
2021-07-28 02:13:57 +03:00
cdbd585f4d
update_appearance
2021-07-28 02:13:57 +03:00
f1560cb807
fixing a bunch of unit test/runtime issues
2021-07-25 18:40:11 -07:00
2adfbea215
Merge remote-tracking branch 'origin/master' into fake_blood
2021-07-23 18:50:09 +03:00
01ed21bb92
Merge pull request #14874 from Citadel-Station-13/silicons-patch-41
...
slight baton powercreep tweak (5 --> 3.5 seconds rmb cooldown, 35 --> 40 damage)
2021-07-22 00:53:53 -07:00
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
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
cf350d0c96
Removes the Bowyery Slab
2021-07-20 19:01:33 +02:00
53516b9f15
Tribal Tools
...
Inbetween normal and powertools
2021-07-20 18:49:40 +02:00
f68548fb24
Expands Hunter's Belts a little
2021-07-20 18:48:28 +02:00
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
24c2ab8b8c
Merge pull request #14940 from timothyteakettle/trash-eating
...
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
89d0c590e6
Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
...
Custom Kegs
2021-07-18 15:06:30 -07:00
5895eb0d31
Merge pull request #14926 from YakumoChen/human-leather-hats
...
Human leather hats
2021-07-18 15:06:22 -07:00
2e88a10ca6
Recipe
2021-07-15 01:50:44 +02:00
41759dd163
fix
2021-07-14 18:15:33 +01:00
65c40a51f2
trash ELEMENT
2021-07-14 17:17:44 +01:00
5490519c48
Update trash.dm
2021-07-14 00:22:12 +01:00
39c09a60b8
initial commit
2021-07-13 23:45:31 +01:00
daf837f89e
Merge pull request #14924 from Citadel-Station-13/restraints
...
handcuffs now require you to stand still to break out of again. Buffs bolas and energy snares breakout time because I forgot to do that when I made you able to move while breaking out of it
2021-07-12 00:03:39 -07:00
42fed8a8fe
craftable human hats
2021-07-05 04:58:52 +00:00
silicons