BongaTheProto
815afcc45a
suits
...
all the suits from that file
2023-04-01 16:01:05 -05:00
BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
Darius
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
BongaTheProto
b05290e952
Merge branch 'master' into pr/609
2023-01-03 12:23:32 -05:00
BongaTheProto
749b7a7598
guh
...
modularized
2023-01-03 12:23:23 -05:00
BongaTheProto
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
SpookyTheFox
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
Cognition
b747ab56f4
Pins, New Loadout Category, CTRLclick for accessory above suit
2022-11-17 20:58:31 -07:00
SpookyTheFox
9dfafa264a
Update security.dm
2022-09-14 19:21:23 -07:00
SpookyTheFox
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
Pin-alternative
e81c720f5b
Merge remote-tracking branch 'upstream/master' into cursed
2022-08-30 12:19:23 +10:00
BongaTheProto
fb66dc2035
Merge remote-tracking branch 'upstream/master'
2022-08-23 20:30:19 -05:00
Aypa
d093323b82
modularizzzzz
2022-08-21 22:32:21 -03:00
zerothebigboy
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
Aypa
7b3658f229
sip sip sip
2022-08-21 18:02:06 -03:00
zerothebigboy
44275e7493
i am thoroughly erect
2022-08-14 21:58:48 -04:00
Pin-alternative
095ffbd8a8
testers
2022-07-29 23:41:17 +10:00
BongaTheProto
53fa6873d1
Merge remote-tracking branch 'upstream/master'
2022-06-02 09:57:31 -05:00
deathride58
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05: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
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
BongaTheProto
b601e94958
Merge remote-tracking branch 'upstream/master'
2022-03-31 00:14:54 -05:00
BlueWildrose
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
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
BongaTheProto
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
BongaTheProto
93016e7568
Merge branch 'Sandstorm-Station:master' into master
2022-02-16 16:03:32 -05:00
silicons
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
BongaTheProto
b437b03b48
Merge remote-tracking branch 'upstream/master'
2022-02-13 13:40:33 -05:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
BongaTheProto
9ce527e068
Merge remote-tracking branch 'upstream/master'
2022-01-26 00:20:29 -05:00
BongaTheProto
e60c7fc091
oops! All splurt
...
mmm module
2022-01-23 15:15:37 -05:00
BongaTheProto
9a76d328c4
Merge remote-tracking branch 'upstream/master'
2021-12-31 21:17:10 -05:00
BongaTheProto
b74ca450e5
nwo i se...
...
tfw seggsclaws give you a better understanding of things
2021-12-30 02:03:26 -05:00
SandPoot
8510dcc08a
Ports tgui stripping (finally) ( #15401 )
...
* Upload files
* Update items.dm
* Update files
* Update files
* Update strippable.dm
* Update strippable
* Update strippable.dm
* Upload files
* Update files
* Update files
* Update files
* update files
* Update files
* Update dog.dm
* Update strippable.dm
* Update equipping
* Update strippable.d
* Upload files
* Upload files
* Update monkey.dm
2021-12-30 07:40:15 +01:00
BongaTheProto
31103f5dc0
Revert "why was this removed"
...
This reverts commit 1a7d558308
2021-12-24 17:48:31 -05:00
BongaTheProto
1a7d558308
why was this removed
...
d
2021-12-24 17:03:00 -05:00
BongaTheProto
a2b2b73a51
Fixed vibrators and made a better removal system
...
From now on you use a common removal verb, also if you're going to add any objects that are supposed to go on genitals try to use the genital_equipment class
2021-12-13 19:50:54 -05:00
BongaTheProto
5d55affd90
Lots of fucking shit
...
- vibrators
- slutcurity stuff
- condoms
2021-12-10 11:39:53 -05:00
StrangeWeirdKitten
c0e3ca5966
Merge branch 'master' into lewd-fixes
2021-12-03 16:54:27 -07:00
StrangeWeirdKitten
04166cd492
Fixes a couple bugs
2021-12-03 16:46:35 -07:00
StrangeWeirdKitten
196cebff53
Merge branch 'master' into Lewd-Clothes
2021-12-02 20:14:16 -07:00
StrangeWeirdKitten
11715f36ba
Finishing Touches
...
The PR is now finished.
2021-12-02 19:51:28 -07:00
StrangeWeirdKitten
8ea79b0128
latexxx
2021-12-02 05:50:08 -07:00
BongaTheProto
95bfe0194e
Added all of the kinky clothes that weren't in already + fixed icons
...
null is a fucking retard
2021-12-01 22:28:51 -05:00
BongaTheProto
1369c548c4
Merge branch 'master' into missing-items-2
2021-12-01 20:53:39 -05:00
BongaTheProto
d7af93c32d
you forgot this
...
yup
2021-12-01 20:25:27 -05:00
BongaTheProto
539a953ceb
Added mesmetron
...
from hyper
I just hope people don't abuse this
2021-12-01 17:27:54 -05:00
