Commit Graph

3013 Commits

Author SHA1 Message Date
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Timothy Teakettle
f6b9858f4f adds snake coiling (#15514)
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
2022-02-23 22:01:13 -07:00
Timothy Teakettle
c9051a6a08 adds polychromic clown outfit and mask (#15359)
* why

* polyclown

* outfit / loadout / etc

* its not pink what do you mean

* newline

* fixes

* test icon diffs
2022-02-18 14:38:50 -08:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
Linzolle
ab6f305805 Merge branch 'pokerchips' of github.com:Citadel-Station-13/Citadel-Station-13 2022-02-01 21:50:26 -07:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
Putnam3145
07bd8437da I missed a couple 2022-01-22 17:04:18 -08:00
Putnam3145
a408957bc6 Various chem tweaks 2022-01-22 16:40:05 -08:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
Lin
0ba9f4254c Merge pull request #15435 from TripleShades/aaaaa
Festive Station Fixes
2021-12-28 21:35:28 +00:00
TripleShades
b3d71081b7 Update turfs.dm 2021-12-25 16:59:48 -05:00
TripleShades
2de8cafa49 fuck 2021-12-24 20:31:17 -05:00
TripleShades
0089b44df2 a 2021-12-23 17:57:15 -05:00
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
Putnam3145
f50dafe141 Fixes SDGF nutrition growth not to be exponential 2021-12-13 17:01:22 -08:00
Lin
76fbc0994f ball map weather (#15405) 2021-12-08 18:49:43 +01:00
Lin
e506bc50dc Merge pull request #15335 from DeltaFire15/synth-chem-time
Synth / IPC kinda-buffs - Chemwarfare Edition
2021-12-01 00:39:02 +00:00
Linzolle
776f69e119 turfs go in the turfs file and it is too cold 2021-11-26 19:53:33 -07:00
Linzolle
afe81f711b Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball 2021-11-26 18:46:57 -07:00
Lin
e081ad70b6 Update custom_items.dm 2021-11-23 02:35:32 +00:00
Lin
c6c6827377 Update custom_items.dm 2021-11-23 02:35:01 +00:00
LetterN
41e5034005 i forgot about this component. Lavaland should have sounds now 2021-11-22 14:18:46 +08:00
Jay
a701aece04 adds space hoodie
removed dupes in custom_w.dmi
2021-11-21 19:49:32 -06:00
keronshb
af83fb9611 FestiveMap 2021 2021-11-20 12:04:35 -05:00
Lin
efa02148d1 Merge pull request #15275 from keronshb/halloweenball2021
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
Jay
b7a34085a0 adds item for donator - t2 2021-11-14 13:59:10 -06:00
DeltaFire
8ca1015510 reagent_all_process macro 2021-11-13 03:23:11 +01:00
DeltaFire
4f8848cfb8 more info
chem master and chem analyzer now state who can actually process a chem
2021-11-12 19:09:14 +01:00
DeltaFire
5d6978bb2f oh god oh fuck 2021-11-04 21:06:42 +01:00
keronshb
f7325767f2 Fixes door and tile error 2021-10-30 15:57:26 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb
9f13c7d8f3 Last roundup of fixes 2021-10-16 10:45:44 -04:00
keronshb
df0e95885e Minor fixes 2021-10-16 01:43:42 -04:00
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
buffyuwu
8209a22ee3 🅰️ 2021-09-20 19:10:03 -04:00
buffyuwu
eb43981dea adds 4 loadout jackets
more clothing ported from RP/existing TG assets with minor edits on some. available in loadout for pre-round selection and character customization.

also fixes flannels by porting additional sprites so they can now be closed/opened. note: this changes some of the flannel /obj/ paths from example: /obj/item/clothing/suit/jacket/flannel/brown
TO
/obj/item/clothing/suit/toggle/jacket/flannel/brown

🆑
fix: flannels can now be toggled in style
add: ports more rp and existing tg assets with minor edits into loadout
/🆑
2021-09-20 19:04:47 -04:00
buffyuwu
8a207d7ebd three more loadout clothing items
made from (many) edits to the gothcoat and blackwizard clothing items respectively
2021-09-19 03:01:02 -04:00
buffyuwu
43cd462d79 saltpr adding more suit slot clothing
adds three suit slot clothing items. the hoodies remade from the unused(?) hoodieskirt asset and the heartcoat comes from a redesign of the bartender's winter coat
2021-09-16 14:19:23 -04:00
zerothebigboy
dec2ea645e nuts 2021-08-26 22:57:22 -04:00
Lin
76f4859480 Merge pull request #15023 from BlueWildrose/MKblastin
Brings back the MK ultra gas, remove MK ultra explosion, but makes the gas less horny and prefbreaky
2021-08-23 15:28:22 -05:00
BlueWildrose
af94680c7d this probably sounds better 2021-08-22 14:45:18 -07:00
BlueWildrose
d117a9b662 woops, that actually was needed. 2021-08-19 04:41:18 -07:00
BlueWildrose
48b2877fab unhornys the MK ultra gas 2021-08-19 04:25:54 -07:00
BlueWildrose
f5688b1ed0 bring back old smoke effect 2021-08-19 01:47:00 -07:00
WanderingFox95
57410e8a61 Separates the tails. 2021-08-15 02:22:03 +02:00
WanderingFox95
fd98ca7cc7 Shark Tails, dodododododo~
(I messed up the order on one of the imported sprites)
2021-08-14 23:18:39 +02:00
WanderingFox95
ec9d1788db Shark Tails, dodododododo 2021-08-14 23:07:22 +02:00
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