9d9f805d7b
Merge branch 'master' into gatofication2
2024-11-21 22:11:24 +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
883bcb7c3a
Added CE gloves
2024-11-10 18:16:27 +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
174aca4b01
Port set_stat and COMSIG_MOB_STATCHANGE from TG
2024-04-13 18:06:52 -04:00
ccbf3dc0dd
closet dor
2024-04-12 22:57:00 -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
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
31e87bc2d7
Safeguard suit
2023-05-01 00:26:56 -05:00
22309324dc
whitespace should not be syntax grrr
2023-05-01 00:23:09 -05:00
8271cf9bc1
move rescue plating to CMO locker
2023-05-01 00:22:59 -05:00
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
b1b4f96053
fix hilbert analyzer in RD locker
2022-12-17 20:10:41 -07:00
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
94bfa88ed9
add more platings
2022-12-13 19:14:43 -07:00
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
eb7b3f706f
Update closets.dm
2022-07-28 16:17:46 -07:00
9f37ed4d35
Update code/game/objects/structures/crates_lockers/closets/secure/security.dm
...
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2022-06-10 19:27:14 -05:00
b4aa87431b
swap things around
...
tosses plate carrier into HoS locker, out of loadout options <3
2022-06-10 19:17:25 -05:00
2555843026
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 03:06:56 -03:00
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00: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
586a035132
Update files
2022-04-06 18:41:31 -03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
829ca8b9a7
Merge branch 'master' into tgui-alerts-and-what-not
2021-10-11 20:41:56 -03:00
11df2bb77c
fixes emps not working on lockers ( #15259 )
...
* Update closets.dm
* Update code/game/objects/structures/crates_lockers/closets.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-10-11 00:48:00 +02: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
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
ea3b248e6c
Ports Parade outfit changes
2021-09-05 14:17:52 -04:00
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
3100f98b90
https://github.com/tgstation/tgstation/pull/57915
2021-07-28 02:13:57 +03:00
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
f1109c4f67
what a crate day (initial commit)
2021-05-01 02:15:07 -04:00
7ca46715d7
Merge branch 'master' into cargo-bugfixes
2021-04-08 19:15:55 -03:00
29bf226fe1
upload closets.dm
2021-04-06 18:18:08 -03:00
2381db5f53
upload files
2021-03-31 12:35:43 -03:00
04f90b749f
fixes material crates not shipping
2021-03-30 12:33:23 -03:00
evilew