Artur
b71a6497e8
Crafting menu fixes and such
...
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
2021-07-16 03:23:02 +03:00
WanderingFox95 and GitHub
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 and GitHub
d50eb91632
Merge pull request #14921 from Putnam3145/componentize-acid
...
Componentizes acid
2021-07-13 11:52:43 -07:00
Lin and GitHub
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
keronshb
c92952c3b0
Cit changes for bullet path
2021-07-06 22:57:31 -04:00
keronshb
fc153b04d3
breaking a mirror is bad for your health ( #58381 )
2021-07-06 22:47:02 -04:00
YakumoChen and GitHub
42fed8a8fe
craftable human hats
2021-07-05 04:58:52 +00:00
silicons and GitHub
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 and GitHub
2fb5355066
Update handcuffs.dm
2021-07-04 10:53:17 -07:00
silicons and GitHub
65f22d7e72
Update handcuffs.dm
2021-07-04 10:52:47 -07:00
silicons and GitHub
a419e6706c
Update handcuffs.dm
2021-07-04 10:51:39 -07:00
Putnam3145
899e74fc83
Componentized acid
2021-07-03 22:10:44 -07:00
silicons and GitHub
4fa81ba13c
Merge pull request #14878 from Putnam3145/remove-sleeps
...
Hopefully fixes whatever requires SHOULD_NOT_SLEEP to be commented out in processing
2021-07-01 21:57:19 -07:00
silicons
8710731b87
tweaks
2021-07-01 20:42:55 -07:00
Putnam3145 and GitHub
9068019bca
Merge pull request #14903 from silicons/spray_fix
...
fixes and rewrites sprays
2021-07-01 10:55:28 -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 and GitHub
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 and GitHub
22ad8f2c8c
Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
...
[Ready] The Daily Whiplash (Newspaper Baton)
2021-06-29 08:50:48 -07:00
silicons
4a5ca2b851
woo
2021-06-28 22:15:25 -07:00
silicons
7091b0467d
cleaner
2021-06-28 19:30:00 -07:00
silicons
07af6b755f
that
2021-06-28 19:17:15 -07:00
silicons
d59ced8f28
changes
2021-06-28 19:15:29 -07:00
silicons
5ef742ffc1
logic
2021-06-28 18:46:25 -07:00
silicons
e690cea147
fix
2021-06-28 18:33:14 -07:00
silicons
a5a476f457
cyborg shovies
2021-06-28 13:10:40 -07:00
Lin and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
e709d5cf0c
More code. Shouldn't break anything.
...
We'll see if it does.
2021-06-22 13:35:37 +02:00
Putnam3145
fbbae70527
i need to go to bed and this is a LOT
2021-06-21 10:14:50 -07:00
Putnam3145
0bf383a90b
does this fix it
2021-06-21 09:18:06 -07:00
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 and GitHub
29604b939c
Update glowshroom.dm
2021-06-20 13:18:54 -07:00
silicons and GitHub
d704fec039
Update stunbaton.dm
2021-06-20 11:08:46 -07:00
silicons and GitHub
54d114ce02
Update stunbaton.dm
2021-06-20 11:06:40 -07:00
zerothebigboy
fb32aa1248
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
...
# Conflicts:
# tgstation.dme
2021-06-20 03:29:50 -04:00
silicons and GitHub
8f3c1fe03a
Update glowshroom.dm
2021-06-19 07:02:51 -07:00
silicons and GitHub
c0e3af55bc
Update glowshroom.dm
2021-06-19 06:59:26 -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
Artur