BongaTheProto
596ab81dd0
Merge remote-tracking branch 'upstream/master'
2023-01-16 01:06:20 -05:00
SandPoot
8cf9db4faa
lack of spess
2023-01-15 18:47:57 -03:00
SandPoot
0fe80e9234
Puts span defines on sandstorm's strings ( #284 )
2023-01-15 00:40:48 -03:00
SandPoot
32159792ad
Adds a button to toggle the capability of interacting through clothes ( #283 )
...
* here it is
* damn typo
2023-01-14 23:47:25 -03:00
BongaTheProto
606391308f
Merge remote-tracking branch 'upstream/master'
2023-01-14 21:18:11 -05:00
SandPoot
0507960150
Does some skirt peeking optimization ( #282 )
2023-01-14 19:09:20 -03:00
BongaTheProto
86a005b590
Merge remote-tracking branch 'upstream/master'
2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-10 22:50:16 -03:00
BongaTheProto
d6aa3acbd4
Merge remote-tracking branch 'upstream/master'
2023-01-09 17:08:06 -05:00
BongaTheProto
ab9d691f1a
Merge remote-tracking branch 'upstream/master'
2023-01-09 16:59:38 -05:00
SandPoot
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
Darius
7edd6a5bd3
Refactor cryptominer processing ( #278 )
...
* Refactor cryptominer processing
Squashed version of PR 276, found here:
https://github.com/Sandstorm-Station/Sandstorm-Station-13/pull/276
* Resolve cryptominor refactor regressions
Fixes minor issues caused by reusing older code revisions.
2023-01-08 16:11:12 -03:00
Darius
912f498825
Fix Adv Toolset sequence break ( #277 )
...
Changes the Advanced Toolset Implant techweb entry to also require Alien Engineering and Cybernetic Implants. This prevents obtaining alien tool implants before researching tool implants or alien tools.
2023-01-08 15:37:53 -03:00
SandPoot
d9df554a95
quick fix for the BSMs
2023-01-07 23:24:15 -03:00
JimmyDrop
80729c8553
Initial Clothing Pass
...
Initial pass of edible Clothing. Should cover most cases with some outliers still existing. In general most important things are protected, such as hard suits, armor, helmets, gasmask, CRBN equipment, and glasses.
Ill give this another pass later to get most of outliers. But for now this should be fine.
2022-12-20 14:51:48 -05:00
BongaTheProto
3666faccf9
Merge remote-tracking branch 'upstream/master'
2022-12-15 01:25:03 -05:00
SandPoot
a102c785e2
Adds an arousal button to the interaction ui (also does some ui "niceing") ( #275 )
...
* the entire content
* out of scope but critical.
2022-12-14 20:05:37 -03:00
BongaTheProto
963aeb7e11
Merge remote-tracking branch 'upstream/master'
2022-12-06 21:22:29 -05:00
LemonInTheDark
8eec99b320
Caches GetJobName. Fuck you ( #274 )
...
* Caches GetJobName. Fuck you
This code made me deeply upset, WHY IS IT RECURSIVE WHY WHY WHY WHY WHY WHY WHY WHY WHY WHY WHY
* Centcom handling, properly this time
* Empties out real_job_name
* Sets real_job_name up in the right place
* Moves real_job_name to SSjob, uses modularTM
* Yeet
* Removes old code, swaps over to the SSjob list
* dme changes
* indents... comments
Co-authored-by: SandPoot <enric_gabirel@hotmail.com >
2022-12-06 17:09:36 -03:00
BongaTheProto
7e716bb64f
Merge branch 'Sandstorm-Station:master' into master
2022-11-30 14:30:18 -05:00
SandPoot
4ddedd118f
TGS: Bad topic exchange!
2022-11-30 13:37:48 -03:00
Fabian272
939d0bcfd0
Changes the kinkmate loincloth to have sensors, changes loincloth crafting to have sensored and sensorless versions.
2022-11-07 21:36:42 +01:00
BongaTheProto
ef6a2bdbc1
Merge branch 'Sandstorm-Station:master' into master
2022-10-20 19:11:47 -05:00
SandPoot
fd7fa516f7
Adds the bitfield menu to slot_flags ( #269 )
...
* Upload files
* reorder alphabetically like the others.
2022-10-19 21:26:40 -03:00
zeroisthebiggay
80684f1cc6
Update negative.dm
2022-10-17 18:36:49 -04:00
BongaTheProto
36198f2b8c
Merge branch 'Sandstorm-Station:master' into master
2022-10-16 17:49:02 -05:00
SandPoot
b854771d79
Lets lizards have ears ( #267 )
2022-10-16 16:22:06 -03:00
BongaTheProto
19052bf49c
Merge pull request #533 from LamkasDev/feature_straponench
...
Make strapons compatible with fleshlights
2022-10-15 14:57:53 -05:00
LamkasDev
6c295546ad
Merge branch 'SPLURT-Station:master' into feature_straponench
2022-10-10 22:44:24 +02:00
LamkasDev
436be7d869
feat: add strapon fleshlight compability
2022-10-10 22:43:36 +02:00
BongaTheProto
2d53e8f85d
Merge branch 'master' into DONUTSDDDDDFSD
2022-10-09 17:19:43 -05:00
BongaTheProto
ae6a6b70e5
Merge remote-tracking branch 'upstream/master'
2022-10-09 12:57:48 -05:00
SandPoot
92f8d3debc
i love invisible conflicts
2022-10-09 11:52:03 -03:00
BongaTheProto
7b25cd111a
teh... donut...
...
complaints incoming
2022-10-03 22:58:32 -05:00
BongaTheProto
60c3e439dc
Merge branch 'Sandstorm-Station:master' into master
2022-09-29 17:04:31 -05:00
memerson1337
123182c8b2
Adds Off-Duty title ( #265 )
...
Adds a new Assistant job title
2022-09-29 16:10:00 -03:00
BongaTheProto
054f2aa52d
follow-up
2022-09-28 16:08:29 -05:00
BongaTheProto
f1ed056576
Merge remote-tracking branch 'upstream/master'
2022-09-28 15:26:54 -05:00
NullFag
723d2c8d0f
Adds jumpskirt peeking ( #264 )
2022-09-28 16:16:06 -03:00
BongaTheProto
e1cb9c8346
Merge remote-tracking branch 'upstream/master'
2022-09-27 23:19:10 -05:00
NullFag
74e9e4e38b
Lizard genitalia ( #263 )
...
* shit
* h
2022-09-27 22:46:50 -03:00
NullFag
812fcc7e54
New markings and frills ( #262 )
2022-09-27 12:47:59 -03:00
SandPoot
f039efca97
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-27 01:19:55 -03:00
BongaTheProto
35472c001b
Merge pull request #477 from LamkasDev/feature_strapon
...
Add strapons
2022-09-16 18:57:26 -05:00
LamkasDev
0759fc04f2
fix: remove strapon checks for portal panties
2022-09-13 18:30:12 +02:00
BongaTheProto
49055a7fef
Merge branch 'Sandstorm-Station:master' into master
2022-09-08 10:34:50 -05:00
LamkasDev
8aa1a96f97
fix: fix wrong strapon interaction checks
2022-09-08 15:41:18 +02:00
SandPoot
2ed861f2d7
bunch of code optimizations
2022-09-08 03:02:06 -03:00
SandPoot
2f92e8e4ca
removes defunct code
2022-09-08 02:31:20 -03:00
LamkasDev
fba9cd66de
feat: add strapons
2022-09-05 16:34:26 +02:00
