SandPoot
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
Jerry Wester and KrissKr0ss
31e87bc2d7
Safeguard suit
2023-05-01 00:26:56 -05:00
Jerry Wester and KrissKr0ss
22309324dc
whitespace should not be syntax grrr
2023-05-01 00:23:09 -05:00
Jerry Wester and KrissKr0ss
8271cf9bc1
move rescue plating to CMO locker
2023-05-01 00:22:59 -05:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
Jerry Wester and GitHub
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
Jerry Wester
b1b4f96053
fix hilbert analyzer in RD locker
2022-12-17 20:10:41 -07:00
Jerry Wester and GitHub
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
Jerry Wester
94bfa88ed9
add more platings
2022-12-13 19:14:43 -07:00
SandPoot
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
SandPoot
105251893d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-01 12:45:35 -03:00
silicons and GitHub
eb7b3f706f
Update closets.dm
2022-07-28 16:17:46 -07:00
SandPoot
25deceb75f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-19 23:02:20 -03: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
TrojanCoyote
b4aa87431b
swap things around
...
tosses plate carrier into HoS locker, out of loadout options <3
2022-06-10 19:17:25 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
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
SandPoot
9df4ed8253
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:48:16 -03:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
Lin and GitHub
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00: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
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
Solaris-Shade
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
SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
silicons and GitHub
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
SandPoot
ed053988d8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-24 22:11:23 -03:00
Lin and GitHub
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
DeltaFire
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire
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
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
Letter N and GitHub
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
Artur
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
SandPoot and GitHub
829ca8b9a7
Merge branch 'master' into tgui-alerts-and-what-not
2021-10-11 20:41:56 -03:00
SandPoot
2541ad050b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-10 21:07:48 -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
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
SandPoot
4b1df1bfb3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-13 10:18:55 -03:00
zerothebigboy
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
SandPoot
3d6ee4e3e6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-09-08 01:45:49 -03:00
zerothebigboy
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
keronshb
ea3b248e6c
Ports Parade outfit changes
2021-09-05 14:17:52 -04:00
zerothebigboy
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
SandPoot
ab9b824ce9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-08 14:18:09 -03:00
SandPoot