20eb61b319
makes slimes specifically have overlay-blended blood!
2022-05-26 22:56:10 -04:00
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
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
bb3eb904eb
resolves hypo inconsistancy
2021-11-03 03:03:18 +01:00
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
186b552103
merge
2021-10-29 21:50:58 -07:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
0bb9b23537
restore spray bottle sounds
2021-09-27 17:32:07 -03:00
4c82eeeb2a
soup
2021-09-18 18:18:04 -04: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
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
30134a0d2f
cool
2021-09-01 06:32:33 -04:00
d59ced8f28
changes
2021-06-28 19:15:29 -07:00
5ef742ffc1
logic
2021-06-28 18:46:25 -07:00
e690cea147
fix
2021-06-28 18:33:14 -07:00
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
b1c20269a6
he'sstillafurry
2021-05-05 03:38:14 -04:00
5138d86655
skylarlineman'safurry
2021-05-05 03:35:25 -04:00
d547aa7ff1
almost compiling
2021-04-26 23:37:26 -07:00
1585d1c2be
fixes
2021-04-26 23:32:33 -07:00
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
524bb79f0e
tgui machine broke
2021-03-19 15:32:53 -03:00
8fc1dc9c29
changes
2021-02-28 00:40:04 -07:00
e483ce8dfc
changes
2021-02-28 00:05:32 -07:00
70b8d833c0
changes
2021-02-28 00:00:14 -07:00
cbac292731
Adds back aphro, nympho
2021-02-18 21:22:43 -08:00
61ab2a5a53
logging fixes
2021-02-13 19:47:17 -07:00
8cb8ddef42
Merge pull request #13969 from Arturlang/blood_bag_tweaks
...
Tweaks blood bag consumption
2021-01-20 15:26:12 -07:00
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
cc4c3533b7
Apply suggestions from code review
...
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-01-20 02:25:22 +02:00
19f27f2f59
Somehow forgot this very important detail
2021-01-14 10:57:46 +02:00
df825b4441
deltafire's suggested fixes
2021-01-12 00:23:39 +02:00
ffe20839fe
tweaks loss numbers
2021-01-04 23:46:48 +02:00
6388c3cf55
Blood bag delays
2021-01-04 23:43:33 +02:00
8a471d6984
logs
2020-12-31 12:35:45 -08:00
251bd3e06b
logging
2020-12-31 12:33:05 -08:00
e50760f641
Lilly please that's not funny
2020-12-19 00:59:50 +13:00
8f30d5a686
Update borghydro.dm
2020-12-19 00:46:04 +13:00
5b03f5b0ec
more
2020-11-12 23:36:18 -07:00
06cb91ca3d
updates all BODYPART_ORGANIC occurances
...
:)
2020-10-06 18:01:25 +02:00
c4885d81f3
Merge branch 'master' into spike-loot-differentces
2020-08-27 03:41:14 -04:00
8699ce2174
fixes a bunch of broken clickdelays ( #13218 )
...
* fixes
* fix
2020-08-25 20:58:20 +02:00
1b61a5feb2
Merge branch 'master' into spike-loot-differentces
2020-08-12 15:10:37 -04:00
deathride58