75d1a7d69c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-26 04:31:35 -03:00
dc08550162
push
2024-08-25 04:38:03 -03:00
91a9223df6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-25 17:08:42 -03:00
0517ece12a
fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon
2024-04-24 22:30:25 -04:00
4c25ac80a7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-16 18:25:10 -03:00
0b4dcfd73a
Fix invalid gun overlays
2024-04-16 02:19:41 -04:00
e74d787bf1
Fix string cell types
2024-04-16 01:14:28 -04:00
86c1a2eeaa
Fix invalid gun overlays
2024-04-16 01:14:28 -04:00
fc53ab850c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-14 20:15:08 -03:00
e37fbc72e0
Fix miniature egun overlays
2024-04-13 20:14:19 -04:00
54f584fa80
Fix instakill laser rifle overlays
2024-04-13 20:14:19 -04:00
8d7048a902
Fix scattershot rifle charge overlay
2024-04-13 20:14:19 -04:00
97b53dc6a7
Fix cyborg mounted laser icons
2024-04-13 20:14:19 -04:00
2e2528ee56
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-13 00:36:29 -03:00
36bc86cf9c
guns... potat
2024-04-12 23:44:29 -03:00
4af0628c8b
woo
2024-04-12 22:36:44 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
8516b07eee
please do not end your paths with /
2024-03-13 14:43:40 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -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
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
7eaef36e11
d k daunkey kaung
2024-01-03 22:42:03 -03:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
8cdb82a23f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-12 22:06:13 -03:00
c36105ef88
holy hell
2023-12-07 23:08:17 -03:00
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
c519c1e128
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-11-21 15:00:51 -03:00
5dc2241d6a
Syndicate Skinned Box Station ( #15580 )
...
* Syndicate Skinned Box Station
* Create syndicatestation.json
Okay tHIS FIXED IT I THINK HOLY CRAP THIS WAS AN EXPERIENCE. HERES THE JSON!
* actually makes this work
* random runtime
we lvoe lesser-used items with runtiming actions
---------
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2023-11-13 12:48:38 +01:00
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
c5987c6c79
More mining ror reskin ( #290 )
2023-01-21 13:52:00 -03:00
c8fc27fc9c
Merge pull request #15930 from SandPoot/reskinning
...
Update to reskinning
2023-01-11 01:00:35 +00:00
2a772c8482
Adds the commando skin from ror & ror2 to the mining hardsuit ( #280 )
...
* first commit with everything
* quick fix and little extra usage!
* the boy
* previous could break
* better head
2023-01-09 18:55:07 -03:00
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
642d24e8e1
tether module
2022-12-17 16:54:20 -07:00
011dd2e817
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-16 16:47:19 -03:00
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
1ebc2e584b
makes weapons unsafe
2022-09-17 06:53:46 -07:00
15006a5dfd
Revert "adds gun safeties, remember to turn them off."
...
This reverts commit 9ca985b769
2022-09-17 06:47:26 -07:00
64ce476764
removes admin messaging
2022-09-16 19:28:56 -07:00
9ca985b769
adds gun safeties, remember to turn them off.
2022-09-16 19:24:21 -07:00
29d16e5f30
fixes weapon safety and fire selector button.
2022-09-16 19:24:06 -07:00
SandPoot