Lin
723decec2b
Merge pull request #15882 from Citadel-Station-13/silicons-patch-16
...
updates kate walker's donator item
2022-12-12 19:13:42 -07:00
Cognition
b747ab56f4
Pins, New Loadout Category, CTRLclick for accessory above suit
2022-11-17 20:58:31 -07:00
silicons
5b954558da
Update __donator.dm
2022-11-03 22:50:56 -07:00
Lin
03c62f4359
Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
...
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
SandPoot
24ee6077c7
push changes
2022-10-23 00:18:03 -03:00
zerothebigboy
44275e7493
i am thoroughly erect
2022-08-14 21:58:48 -04:00
LetterJay
64bcd694c1
donator blah blah, my head hurts
2022-07-18 00:20:33 -05:00
Timothy Teakettle
c025a4f36e
commit names arent important right?
2022-06-02 20:40:21 +01:00
Timothy Teakettle
dad0aa72f0
OH BOY
2022-06-02 19:18:11 +01:00
TrojanCoyote
024e4dade1
Adds kitsune masks to loadout options
...
black and white kitsune masks go into loadout
2022-05-31 07:48:26 -05:00
SandPoot
da1f58f297
Update files
2022-05-19 13:23:17 -03:00
SandPoot
5dad84a486
Update files
2022-05-16 21:44:25 -03:00
Lin
f2ca3a067d
Merge pull request #15617 from timothyteakettle/timothyteakettle-patch-1
...
poly alt cloak can now be renamed/dedescriptioned in loadout
2022-05-16 02:31:01 +00:00
Timothy Teakettle
3157a11209
Update neck.dm
2022-05-13 15:36:05 +01:00
SandPoot
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
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
BlueWildrose
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
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
silicons
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
silicons
edd3a510f1
Merge pull request #15526 from timothyteakettle/bartender-pda
...
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
2022-02-26 18:08:47 -07:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
Timothy Teakettle
027002f928
haha what if we didn't show secretcatchem
2022-02-23 12:07:03 +00: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
DeltaFire
051f5780db
tweaks
...
Synthtissue borrowed health capped at 250, gradually flips from clonedamage towards toxdamage within 45 cycles.
Restores organ healing for strange reagent, but only in a very weak fashion (5 heal for failing organs)
2021-12-31 00:16:49 +01: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
