TripleShades
2de8cafa49
fuck
2021-12-24 20:31:17 -05:00
TripleShades
0089b44df2
a
2021-12-23 17:57:15 -05: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
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
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
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
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
silicons
f327592784
Update __donator.dm
2021-08-04 00:51:37 -07:00
Artur
5acd7fef2d
makes salglu not deadly
2021-08-02 21:54:47 +03:00
Jay
a88e83e579
Adds military gas mask for donator
2021-08-01 18:42:43 -05:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
Putnam3145
975582380b
always search when you change paths
2021-07-25 18:52:01 -07:00
Artur
2adfbea215
Merge remote-tracking branch 'origin/master' into fake_blood
2021-07-23 18:50:09 +03:00
silicons
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
silicons
8710731b87
tweaks
2021-07-01 20:42:55 -07:00
Putnam3145
c253a2de86
alright how about these
2021-06-21 09:52:54 -07:00
WanderingFox95
9cdc45a905
Bit of this
2021-06-02 15:27:47 +02:00
WanderingFox95
b563e6c2e0
Splits Engineering and Security ORV Suits
2021-06-02 15:25:50 +02:00
Lin
8d9571b863
Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix
...
Igiari Donator Item fix
2021-05-23 14:16:59 -05:00
Igiari
ad6b6b29a0
I'm dumb
2021-05-20 20:08:07 -05:00
Igiari
1485b2fab5
I was told to do this too
2021-05-18 20:19:34 -05:00
Igiari
3de1291dcf
Good suggest.
...
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com >
2021-05-18 17:45:55 -05:00
Igiari
27a779da01
It was supposed to be a uniform all along
...
Fine, I'll fix it myself
2021-05-18 13:02:45 -05:00
Timothy Teakettle
5bc33c222a
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
2021-05-08 01:28:23 +01:00
silicons
cd0a0bbe5c
Update healing.dm
2021-05-06 03:02:46 -07:00
