Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
Jerry Wester
b1b4f96053
fix hilbert analyzer in RD locker
2022-12-17 20:10:41 -07:00
Jerry Wester
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
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
silicons
eb7b3f706f
Update closets.dm
2022-07-28 16:17:46 -07:00
TrojanCoyote
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
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
Lin
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
silicons
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
Lin
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00: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
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
Artur
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
SandPoot
829ca8b9a7
Merge branch 'master' into tgui-alerts-and-what-not
2021-10-11 20:41:56 -03:00
Timothy Teakettle
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
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
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
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
Artur
3100f98b90
https://github.com/tgstation/tgstation/pull/57915
2021-07-28 02:13:57 +03:00
qweq12yt
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
The0bserver
f1109c4f67
what a crate day (initial commit)
2021-05-01 02:15:07 -04:00
qweq12yt
7ca46715d7
Merge branch 'master' into cargo-bugfixes
2021-04-08 19:15:55 -03:00
SandPoot
29bf226fe1
upload closets.dm
2021-04-06 18:18:08 -03:00
SandPoot
2381db5f53
upload files
2021-03-31 12:35:43 -03:00
qweq12yt
04f90b749f
fixes material crates not shipping
2021-03-30 12:33:23 -03:00
Lin
715f86ef5c
Merge pull request #14447 from LetterN/fixes-2
...
Fixes laptop and tweaks stacks
2021-03-22 19:52:42 -05:00
Lin
4e641eedb9
Merge pull request #14489 from LetterN/amogus
...
Fixes NIRM
2021-03-22 15:37:56 -05:00
LetterN
760a7de229
Merge remote-tracking branch 'origin/master' into fixes-2
2021-03-22 09:32:21 +08:00
LetterN
86b8bbf727
no more free shipping
2021-03-21 21:44:04 +08:00
silicons
d434f60cb3
Update closets.dm
2021-03-18 16:59:03 -07:00
LetterN
228105b391
laptop and closet decon fix
2021-03-16 14:47:28 +08:00
SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
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
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
silicons
1df2257e61
Merge pull request #14052 from SiliconMain/baitbegone
...
Update engineering.dm
2021-01-13 22:43:01 -07:00
SiliconMain
cccb547a72
Update engineering.dm
2021-01-13 23:41:49 -06:00
silicons
bcb2e16cef
Merge pull request #14035 from SiliconMain/baitbegone
...
Comments out hololocks
2021-01-13 16:53:01 -07:00
SiliconMain
2d3e24fee4
Update engineering.dm
2021-01-12 14:43:54 -06:00
MrJWhit
abffac67b2
Port'n
2021-01-06 03:16:08 -05:00
