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
silicons
59e541d2e7
Merge pull request #14971 from Arturlang/nanite_updates
...
Ports update appearance
2021-08-08 04:06:18 -07:00
Artur
5acd7fef2d
makes salglu not deadly
2021-08-02 21:54:47 +03:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
Artur
30016f38a8
compiles
2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d
update_appearance
2021-07-28 02:13:57 +03:00
Putnam3145
f1560cb807
fixing a bunch of unit test/runtime issues
2021-07-25 18:40:11 -07:00
Artur
2adfbea215
Merge remote-tracking branch 'origin/master' into fake_blood
2021-07-23 18:50:09 +03:00
Lin
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
silicons
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
silicons
24c2ab8b8c
Merge pull request #14940 from timothyteakettle/trash-eating
...
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
silicons
89d0c590e6
Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
...
Custom Kegs
2021-07-18 15:06:30 -07:00
silicons
5895eb0d31
Merge pull request #14926 from YakumoChen/human-leather-hats
...
Human leather hats
2021-07-18 15:06:22 -07:00
WanderingFox95
2e88a10ca6
Recipe
2021-07-15 01:50:44 +02:00
timothyteakettle
41759dd163
fix
2021-07-14 18:15:33 +01:00
timothyteakettle
65c40a51f2
trash ELEMENT
2021-07-14 17:17:44 +01:00
timothyteakettle
5490519c48
Update trash.dm
2021-07-14 00:22:12 +01:00
timothyteakettle
39c09a60b8
initial commit
2021-07-13 23:45:31 +01:00
Lin
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
YakumoChen
42fed8a8fe
craftable human hats
2021-07-05 04:58:52 +00:00
silicons
472fda9504
Merge pull request #14833 from zeroisthebiggay/finallytools
...
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
2021-07-04 10:59:43 -07:00
silicons
2fb5355066
Update handcuffs.dm
2021-07-04 10:53:17 -07:00
silicons
65f22d7e72
Update handcuffs.dm
2021-07-04 10:52:47 -07:00
silicons
a419e6706c
Update handcuffs.dm
2021-07-04 10:51:39 -07:00
silicons
8710731b87
tweaks
2021-07-01 20:42:55 -07:00
Putnam3145
f3b590f5f0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps
2021-06-30 02:19:02 -07:00
silicons
a00ed83c5e
Merge pull request #14883 from WanderingFox95/WanderingFox95-plushies
...
[Ready] The plushie PR you didn't know we needed (but we kinda did)
2021-06-29 08:51:24 -07:00
silicons
22ad8f2c8c
Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
...
[Ready] The Daily Whiplash (Newspaper Baton)
2021-06-29 08:50:48 -07:00
silicons
a5a476f457
cyborg shovies
2021-06-28 13:10:40 -07:00
Lin
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
silicons
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
WanderingFox95
9bd1433bbe
Adds a child item to the telebaton
...
identical stats for the future but different looks.
2021-06-25 11:38:21 +02:00
Putnam3145
37fe5f297c
fix double . in fusion scan
2021-06-22 22:38:20 -07:00
WanderingFox95
e709d5cf0c
More code. Shouldn't break anything.
...
We'll see if it does.
2021-06-22 13:35:37 +02:00
Putnam3145
0bf383a90b
does this fix it
2021-06-21 09:18:06 -07:00
silicons
98ff06fa1a
the roasted roasted roasted roasted roasted roasted roasted roasted......... ( #14850 )
...
* Update misc.dm
* Update code/game/objects/items/melee/misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* Update misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2021-06-21 17:54:56 +02:00
Putnam3145
f77495f45d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-21 02:19:51 -07:00
silicons
d704fec039
Update stunbaton.dm
2021-06-20 11:08:46 -07:00
silicons
54d114ce02
Update stunbaton.dm
2021-06-20 11:06:40 -07:00
Putnam3145
dbdc3001ba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-16 23:33:14 -07:00
silicons
01e0fa16fe
it works.
2021-06-14 13:52:48 -07:00
silicons
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
zerothebigboy
a64d94a7cc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
2021-06-13 18:25:35 -04:00
zerothebigboy
bae89fcaba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
2021-06-13 18:19:01 -04:00
zerothebigboy
319e03476b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites
2021-06-13 18:16:08 -04:00
zerothebigboy
e757f9ea2c
thetwentythirdofmany
2021-06-12 17:41:09 -04:00
zerothebigboy
e0a311435b
thetwentysecondofmany
2021-06-11 20:53:35 -04:00
zerothebigboy
3fae79f876
thetwentyfirstofmany
2021-06-11 20:28:25 -04:00
zerothebigboy
b7eecc315f
theeighteenthofmany
2021-06-11 19:49:43 -04:00
