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
BongaTheProto
07a1011cc8
Merge branch 'Sandstorm-Station:master' into master
2021-11-24 23:06:03 -05:00
SandPoot
ed053988d8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-24 22:11:23 -03:00
BongaTheProto
1293e7be22
Added some stuff
...
- config changes
- the extra sprites
- etc.
still have to look into the no clothes bug that makes you need to expose your genitals for the layers to actually work
2021-11-24 03:54:16 -05: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
BongaTheProto
703413027c
Merge remote-tracking branch 'upstream/master'
2021-11-17 14:33:29 -05:00
SandPoot
6025ef041b
Updates some lewd stuff again ( #195 )
2021-11-17 15:21:16 -03:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03: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
Mosley1f
59b5447a29
Merge branch 'pr/3'
2021-11-04 20:43:45 -05:00
DeltaFire
5d6978bb2f
oh god oh fuck
2021-11-04 21:06:42 +01:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03: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
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03: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
DeltaFire
64367ff7ba
edge case protection
2021-10-02 18:33:57 +02:00
SandPoot
30c43de717
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-28 11:39:58 -03:00
DeltaFire
9f3688f9cc
health payback affected by metabolism
2021-09-25 02:32:29 +02:00
DeltaFire
31679157dc
adjust
2021-09-25 02:24:12 +02:00
DeltaFire
6cffeacd42
typo
2021-09-22 23:32:35 +02:00
DeltaFire
2e2aa36875
grab the ghost
2021-09-22 22:47:08 +02:00
DeltaFire
7752e0d624
synthtissue and sr
2021-09-22 22:30:43 +02: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
SandPoot
e7d5275a70
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-20 14:32:29 -03: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
SandPoot
e738c3cf21
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-27 12:40:48 -03: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
SandPoot
dfe4a91219
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-11 13:06:19 -03: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
SandPoot
ab9b824ce9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-08 14:18:09 -03:00
silicons
8b09d98361
Merge pull request #14978 from Citadel-Station-13/mgas-dontoar
...
Adds military gas mask for donator
2021-08-08 04:08:37 -07:00
silicons
59e541d2e7
Merge pull request #14971 from Arturlang/nanite_updates
...
Ports update appearance
2021-08-08 04:06:18 -07:00
