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
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
94bfa88ed9
add more platings
2022-12-13 19:14:43 -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
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
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
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
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
04f90b749f
fixes material crates not shipping
2021-03-30 12:33:23 -03:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
1df2257e61
Merge pull request #14052 from SiliconMain/baitbegone
...
Update engineering.dm
2021-01-13 22:43:01 -07:00
cccb547a72
Update engineering.dm
2021-01-13 23:41:49 -06:00
bcb2e16cef
Merge pull request #14035 from SiliconMain/baitbegone
...
Comments out hololocks
2021-01-13 16:53:01 -07:00
2d3e24fee4
Update engineering.dm
2021-01-12 14:43:54 -06:00
abffac67b2
Port'n
2021-01-06 03:16:08 -05:00
35896e92ec
Paramedic office added and operating room remodeled
2020-12-22 21:50:22 -04:00
3735efbfca
Ports construction bags
2020-11-29 18:29:03 -08:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
116145872f
commit thing, need to see changies but gitlens is denying me
2020-08-29 14:00:46 +08:00
f04918bdca
working code?
2020-08-21 15:09:49 +08:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
495ccc99c5
Porting some cargo/vending updates.
2020-06-08 06:12:51 +02:00
1a9484cf2e
Fixing missing clothing icons etc.
2020-06-02 17:43:31 +02:00
9a9e76664f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 22:47:13 +02:00
evilew