dzahlus
7da856ebef
remove bleed
...
haha forgot this for a second
2021-02-07 17:09:35 +01:00
dzahlus
601305426f
wounds now work
2021-02-07 17:08:06 +01:00
silicons
cf4a5f3388
Merge pull request #14189 from dzahlus/diversify-sound
...
Diversify weapon sound
2021-02-06 11:42:36 -07:00
Fermi
f236b2da29
Merge branch 'master' into Dispencer-UI-change
2021-02-06 02:40:27 +00:00
dzahlus
2322652d48
haha oops forgotthis existed
2021-02-05 13:04:11 +01:00
DeltaFire
ee7c45fe77
Merge pull request #14031 from Putnam3145/fermi-emp-fix
...
Fixes fermichem EMPs being massive.
2021-01-30 18:44:20 +01:00
zeroisthebiggay
90bd136dad
Update modular_citadel/code/modules/client/loadout/head.dm
...
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com >
2021-01-29 07:38:37 -05:00
zerothebigboy
c6420ae433
fuck
2021-01-27 22:59:44 -05:00
silicons
1d72a574b2
Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
...
loadout part 3: custom names and descriptions
2021-01-27 19:09:41 -07:00
silicons
912b09d33b
Merge pull request #14146 from zeroisthebiggay/ooffuck
...
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
2021-01-27 19:08:19 -07:00
zerothebigboy
f3072433ff
thankyoubasedrp
2021-01-27 14:56:26 -05:00
zeroisthebiggay
4b6f0d3ffa
Update mask.dm
2021-01-26 14:11:00 -05:00
zerothebigboy
7b2a6955cc
please
2021-01-26 13:13:09 -05:00
Putnam3145
94d419c6cd
Update modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
...
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-01-20 14:08:07 -08:00
Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
dedb0cb62e
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
Timothy Teakettle
b956df2226
name description implement
2021-01-18 21:59:00 +00:00
Fermi
cb614bcd95
Merge branch 'master' into Dispencer-UI-change
2021-01-17 22:19:45 +00:00
Blue Wildrose
27f30e526c
oh right guess these variables won't be used any more.
2021-01-14 07:22:25 -07:00
Blue Wildrose
7ece70faac
Enough of this fuckin CBT and titty straining
2021-01-14 07:14:16 -07:00
silicons
ae290cf5f0
newlines
2021-01-13 16:56:36 -07:00
Putnam
699d8e1e88
Fixes fermichem EMPs being massive.
2021-01-11 21:06:47 -08:00
silicons
9551f67b5e
Update chems.dm
2021-01-05 02:44:57 -07:00
Fermi
5b703e84a4
Merge branch 'master' into Dispencer-UI-change
2021-01-04 16:21:06 +00:00
Fermi
d9047e458c
Testing and bugfixes
2021-01-04 15:47:35 +00:00
Fermi
57cd698994
Tweaks and fixes. Should be freature complete now.
2021-01-04 13:40:26 +00:00
Fermi
c7965d3b4a
Pushing to review diff
2021-01-04 10:53:21 +00:00
Fermi
37c3bbbd9c
Fixing things and gui
2021-01-04 01:48:35 +00:00
silicons
7357ae3bc0
Merge pull request #13951 from BlueWildrose/CompensatingForSomething
...
Max groin cannon size increased before being punished for erecting a massive mayo-blaster to -max roundstart config- inches instead of 20
2021-01-03 18:13:50 -07:00
Blue Wildrose
642c4a5806
erect up the config instead in case this situation comes up again.
2021-01-02 00:18:49 -07:00
Blue Wildrose
843b1494b3
max penis size increased before being punished for having one
2021-01-01 23:01:39 -07:00
Timothy Teakettle
813e0f4c79
Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items
2021-01-01 22:30:04 +00:00
Timothy Teakettle
c3e9cdd9a5
finale
2020-12-26 23:09:19 +00:00
Putnam3145
64cfeef8eb
Makes zeolites waaaaaay easier to make.
2020-12-24 20:45:35 -08:00
DeltaFire
616a2ce73a
Merge pull request #13773 from Trilbyspaceclone/patch-405
...
Zeolites tweaks
2020-12-22 06:13:36 +01:00
DeltaFire
dab3f6f125
Merge pull request #13699 from silicons/nanite_updates
...
nanite updates: permanent nanites, hostile lockdown, anti-virus, resistance tweaking
2020-12-14 05:56:48 +01:00
Trilbyspaceclone
b8c753d642
Update fermi.dm
2020-12-13 11:33:06 -05:00
Trilbyspaceclone
282251b834
Zeolites
2020-12-13 09:09:52 -05:00
Putnam3145
f0e51d666c
Merge pull request #13617 from timothyteakettle/loadout-json
...
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
Linzolle
ad200fbb71
a stupid nitpick
2020-12-07 17:52:07 -06:00
Timothy Teakettle
e413fcb091
more fixes
2020-12-06 22:14:35 +00:00
timothyteakettle
61cc33d995
Merge remote-tracking branch 'upstream/master' into loadout-json
2020-12-06 17:26:04 +00:00
timothyteakettle
0f540884eb
Merge branch 'master' into loadout-json
2020-12-06 17:24:24 +00:00
DeltaFire15
a1d38033a4
Merge pull request #13576 from Sonic121x/patch-2
...
Add a bunch of digitigrade uniform
2020-11-27 22:31:10 +01:00
silicons
8f36a1d2ec
okay
2020-11-22 15:20:52 -07:00
silicons
f8d43b7544
Merge pull request #13679 from DeltaFire15/system-corruption
...
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
silicons
5b03f5b0ec
more
2020-11-12 23:36:18 -07:00
DeltaFire
1faaabd7d0
nanite bane causes corruption
...
Title. 1 corruption per reagent tick, as it IS a pretty rare chemical to see, might give it some uses for robot assasinations, as it's a bit quieter than EMPing parts of the station repeatedly.
2020-11-13 03:51:11 +01:00
Jay
e1c8d669d5
Exo frame donator
2020-11-07 10:23:14 -06:00
silicons
a13765b7c9
Merge pull request #13521 from DeltaFire15/zeolites-tweaking
...
[READY] Rebalances zeolites and their reaction
2020-11-07 00:16:29 -07:00
