0d9eebd20c
Merge remote-tracking branch 'upstream/master'
2025-04-24 17:03:15 -05:00
3425760ced
push
2025-02-25 17:48:02 -03:00
68b44b7e12
CarbonatedCumUpdateFix1
2024-12-09 20:52:48 -06:00
c29c78eb69
carbonated cum fixes
2024-12-09 08:22:21 -06:00
8fe6721f4a
Adds Carbonated Cum
2024-12-09 07:47:58 -06:00
106d5b3c1e
Merge remote-tracking branch 'upstream/master'
2024-08-25 12:48:45 -05:00
c07e94be66
push
2024-08-24 21:28:55 -03:00
1e1fc329f8
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-04-13 14:12:39 -05:00
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05:00
e3b3f3295d
V1.0
2024-01-25 01:10:26 -06:00
22befe7327
Winter QOL
2023-12-23 14:59:11 +01:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
7ea1e5be04
Subby clothing
2023-06-11 22:39:10 -03:00
56c161f309
Flannel jackets and centcomdress
2023-06-08 09:23:51 -03:00
815afcc45a
suits
...
all the suits from that file
2023-04-01 16:01:05 -05:00
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
b25248d7ae
Add all job cartridges to PTech
...
Adds all remaining unavailable job cartridges to the Head of Personnel's PTech vending machine. Carts are sorted by standard job, virus, then command.
2023-01-12 00:13:42 -05:00
b05290e952
Merge branch 'master' into pr/609
2023-01-03 12:23:32 -05:00
749b7a7598
guh
...
modularized
2023-01-03 12:23:23 -05:00
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
611332781f
moved blueshift gear out of premium
...
This makes them all cheaper. Uniform pieces were 700cr in the vendor. They are a cosmetic alternative to normal sec uniforms, no need to make them unobtainable expensive.
2022-12-02 20:36:24 -05:00
b747ab56f4
Pins, New Loadout Category, CTRLclick for accessory above suit
2022-11-17 20:58:31 -07:00
9dfafa264a
Update security.dm
2022-09-14 19:21:23 -07:00
00f3ba9294
changed 1 to 5
...
Changed the availability of all three Blue Shift themed uniform parts from 1 per vendor, to 5.
2022-09-14 16:53:47 -07:00
e81c720f5b
Merge remote-tracking branch 'upstream/master' into cursed
2022-08-30 12:19:23 +10:00
fb66dc2035
Merge remote-tracking branch 'upstream/master'
2022-08-23 20:30:19 -05:00
d093323b82
modularizzzzz
2022-08-21 22:32:21 -03:00
4cd74e3b31
thighjob from a girl wearing a microskirt who can beat the shit out of you whenever
2022-08-21 20:55:37 -04:00
7b3658f229
sip sip sip
2022-08-21 18:02:06 -03:00
44275e7493
i am thoroughly erect
2022-08-14 21:58:48 -04:00
095ffbd8a8
testers
2022-07-29 23:41:17 +10:00
53fa6873d1
Merge remote-tracking branch 'upstream/master'
2022-06-02 09:57:31 -05:00
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04:00
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -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
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
b601e94958
Merge remote-tracking branch 'upstream/master'
2022-03-31 00:14:54 -05:00
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
3af3c2d663
A lot
...
https://github.com/quotefox/Hyper-Station-13/pull/621
https://github.com/quotefox/Hyper-Station-13/pull/421
https://github.com/quotefox/Hyper-Station-13/pull/1405
https://github.com/quotefox/Hyper-Station-13/pull/698
https://github.com/quotefox/Hyper-Station-13/pull/853
https://github.com/quotefox/Hyper-Station-13/pull/1147
https://github.com/quotefox/Hyper-Station-13/pull/440
https://github.com/quotefox/Hyper-Station-13/pull/457
https://github.com/quotefox/Hyper-Station-13/pull/1174
https://github.com/quotefox/Hyper-Station-13/pull/1221
https://github.com/quotefox/Hyper-Station-13/pull/424
https://github.com/quotefox/Hyper-Station-13/pull/934/files
2022-03-13 02:00:58 -05:00
93016e7568
Merge branch 'Sandstorm-Station:master' into master
2022-02-16 16:03:32 -05:00
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
b437b03b48
Merge remote-tracking branch 'upstream/master'
2022-02-13 13:40:33 -05:00
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
e60c7fc091
oops! All splurt
...
mmm module
2022-01-23 15:15:37 -05:00
Mosley