9d9f805d7b
Merge branch 'master' into gatofication2
2024-11-21 22:11:24 +01:00
4518a0b016
NT to GT - comments
...
- added GS13 comments to wherever NT was changed into GT
2024-11-21 21:45:25 +01:00
b251055c6e
bluespace tray buff
...
from 50 to 100
2024-11-21 01:05:42 +01:00
bdccf133cb
load of fixes
...
- increased age_min from 18 to 21
- gave RCDs an option of airlock direction
- buffed bluespace trays
- made more windows / walls directional and merging with airlocks/windows
- gave the rusty walls perspective sprites
- removed stoner language from beach bum
- enabled prisoner (for now)
- buffed HEVA not to be weak to goliaths
- brought back smaller, more realistic bee sprites
2024-11-20 15:51:04 +01:00
10ef9e374a
Nanotrasen to GATO - comments
...
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
42c59d3506
NT to GT
...
Changed most instances of NT (Nanotranse) to GT (GATO). Left alone stuff that makes sense for it to be NT branded
2024-11-09 23:11:05 +01:00
edea3ae8e0
nanotrasen to gato
...
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
3679a0eb1d
more tweaks
2024-09-17 18:48:48 -04:00
dc08550162
push
2024-08-25 04:38:03 -03:00
e57c803e3a
Fix invalid box overlays
2024-04-16 02:19:36 -04:00
dd8c641520
Merge pull request #15486 from SandPoot/kills-cache
...
Solves issues with overlays by updating the whole subsystem
2024-04-12 23:31:54 -04:00
dfe90dfb61
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486
2024-04-12 20:48:41 -03:00
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
8516b07eee
please do not end your paths with /
2024-03-13 14:43:40 -03:00
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
27bdd4b732
aiModule > ai_module
2023-12-17 23:20:43 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
4797a49914
Update files
2023-10-13 16:40:45 -03:00
d90fa375e1
Move heirloom lists to relevant files
...
Port of the current TG heirloom system.
Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.
Also fixes the ancient first aid kit, which is used for a heirloom.
2023-01-04 13:57:54 -05:00
20ffbf1a12
backport
2022-10-26 14:02:11 -05:00
b4f886d999
port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic
2022-09-18 20:55:22 -07:00
d5b380d7b3
iloathecitadelchanges
2022-08-13 18:22:30 -04:00
4e0498573f
thefartdomeengages
2022-08-13 18:16:37 -04:00
1bc3796b06
watchmegetgitbanned
2022-08-11 19:17:16 -04:00
33889870c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-05-17 13:22:40 -07: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
6199aa4d60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits
2022-03-30 12:35:12 -07:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
1adbf914c2
Merge pull request #15414 from BlueWildrose/wingport
...
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
318240bdc6
TG wing port - Now YOU TOO, can be an "angel"
2021-12-07 18:59:07 -07:00
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
186b552103
merge
2021-10-29 21:50:58 -07:00
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04: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
83987db48a
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-10-01 18:51:46 +02:00
5ff4a2ace5
Merge pull request #15180 from LetterN/achives-
...
Achivement & Clowncar update
2021-09-28 00:15:52 -07:00
fe8a652689
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
2021-09-19 21:32:03 +02:00
0b7e514739
t
2021-09-19 14:05:28 +08:00
3c60632312
spiteful
2021-09-14 11:01:20 -04:00
evilew