BongaTheProto
0a48421882
Merge branch 'Sandstorm-Station:master' into master
2023-02-12 16:13:29 -05:00
SandPoot
e1c9fdaf00
fucking fix that mosley annoys me about
2023-02-12 18:03:41 -03:00
BongaTheProto
73abec3913
Merge remote-tracking branch 'upstream/master'
2023-02-11 22:21:31 -05:00
BongaTheProto
ee9800f843
Update holder_micro.dm
2023-02-11 22:20:47 -05:00
SandPoot
0fa94f6edc
size peeking, both standing on table, message
2023-02-11 23:55:46 -03:00
BongaTheProto
929f5399aa
followup
2023-02-11 21:34:18 -05:00
BongaTheProto
a65cd6c96b
Merge remote-tracking branch 'upstream/master'
2023-02-11 21:26:36 -05:00
BongaTheProto
ce464a6903
Merge remote-tracking branch 'upstream/master'
2023-02-11 21:25:29 -05:00
SandPoot
243e7ea02f
safety i guess, people are afraid that someone is SOMEHOW gonna manage to open their menu without being admin
2023-02-11 21:54:20 -03:00
SandPoot
117919fe2b
Componentizes Interaction menu + prepares it for screentips by adding a shortcut ( #301 )
...
* files
* let's just use our own parent
* necessary
* two istypes on a row
2023-02-11 14:39:29 -03:00
BongaTheProto
86a1bb06b0
Merge remote-tracking branch 'upstream/master'
2023-02-02 18:56:02 -05:00
Darius
2ae20de930
Port estrous quirks from SPLURT ( #298 )
...
* Port estrous quirks from SPLURT
This commit ports quirks related to the animal breeding cycle from the downstream server SPLURT.
* Add null check for ashwalker round_season
Adds a null value check for round_id in ashwalker estrous code to prevent possible runtime issues.
2023-02-02 20:29:18 -03:00
BongaTheProto
fcc10eb9cc
Merge remote-tracking branch 'upstream/master'
2023-01-25 18:02:17 -05:00
Darius
893a63cd11
[PORT] New quirk: DNC Order ( #293 )
...
* Port DNC quirt
Ports the do-not-clone quirk from SPLURT. This change is not modular.
- Added a fix for cloning heads and brains
- Removed flavor text implications that the order was voluntary
- Quirk renamed from `DNC` to `DNC Order`
- Trait renamed from `TRAIT_NO_CLONE` to `TRAIT_DNC_ORDER`
* Modularize cloning machine DNC check
Moves the code for DNC Order quirk check in the cloning machine into modular space, and removes it from base code.
2023-01-25 18:47:49 -03:00
BongaTheProto
14a5df0c8a
Merge branch 'Sandstorm-Station:master' into master
2023-01-25 16:42:25 -05:00
SandPoot
a21f3f75a2
NOT TABLE, STRUCTURE, also living_peeker
2023-01-24 22:10:31 -03:00
SandPoot
d2e08f17ea
let's check for structure.climbable instead!
2023-01-24 22:07:15 -03:00
BongaTheProto
7fd55c6574
Merge branch 'Sandstorm-Station:master' into master
2023-01-23 17:31:37 -05:00
SandPoot
0c87f5e0f0
different checking method
2023-01-22 23:32:29 -03:00
BongaTheProto
3ae8edf803
Merge remote-tracking branch 'upstream/master'
2023-01-22 01:06:28 -05:00
SandPoot
79c8c61459
Makes skirt peeking into an element ( #292 )
2023-01-21 19:30:59 -03:00
BongaTheProto
68649df86c
optimized some copypasted code ( #285 )
...
* less copypaste = good
* fix
* Update lewd_definitions.dm
oops
2023-01-17 07:59:18 -03:00
BongaTheProto
41e15dd097
follow-up
...
I HOPE this doesn't break stuff
2023-01-16 02:20:22 -05:00
BongaTheProto
596ab81dd0
Merge remote-tracking branch 'upstream/master'
2023-01-16 01:06:20 -05: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
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
zeroisthebiggay
80684f1cc6
Update negative.dm
2022-10-17 18:36:49 -04:00
BongaTheProto
7b25cd111a
teh... donut...
...
complaints incoming
2022-10-03 22:58:32 -05:00
LamkasDev
8aa1a96f97
fix: fix wrong strapon interaction checks
2022-09-08 15:41:18 +02:00
LamkasDev
fba9cd66de
feat: add strapons
2022-09-05 16:34:26 +02:00
Pin-alternative
7b278b1f81
paren
2022-07-05 20:45:54 +10:00
Pin-alternative
50245ec870
mlem
2022-07-05 20:38:02 +10:00
Pin-alternative
d58455d082
doin
2022-06-27 10:56:30 +10:00
Pin-alternative
7f4f83e082
needed changes
2022-06-25 20:43:09 +10:00
Pin-alternative
203f21c3d6
things
2022-06-25 18:11:35 +10:00
Pin-alternative
254a5350aa
updatess
2022-06-24 21:20:17 +10:00
Pin-alternative
f59bb6032e
get this stuff done
2022-06-23 20:07:12 +10:00
Pin-alternative
79ab402216
Merge remote-tracking branch 'upstream/master' into cursed
2022-06-10 07:45:46 +10:00
Pin-alternative
64cbd81e9c
Merge remote-tracking branch 'upstream/master' into cursed
2022-06-07 17:10:33 +10:00
BongaTheProto
8b7fa8233c
emotes and quirks
...
ok maybe it happened... but 40 votes? in only 2 days??
2022-06-04 18:46:02 -05:00
BongaTheProto
53222f62a3
Merge remote-tracking branch 'upstream/master'
2022-06-04 13:34:52 -05:00
BongaTheProto
6b5aa32aa3
merge followup
2022-06-04 13:26:34 -05:00
BongaTheProto
04d9c7d167
Merge remote-tracking branch 'upstream/master'
2022-06-04 13:25:54 -05:00
SandPoot
5517d4a92c
fix runtime
2022-06-04 08:05:43 -03:00
SandPoot
461bfc3f9c
Fixing some stuff about sizecode ( #257 )
2022-06-03 19:45:19 -03:00
Pin-alternative
b3b70bb319
Merge remote-tracking branch 'upstream/master' into cursed
2022-05-30 20:09:20 +10:00
Pin-alternative
c0f224efff
some more crap
2022-05-28 20:18:09 +10:00
BongaTheProto
805968e8c3
Merge branch 'master' into prefs-update
2022-05-11 10:51:56 -05:00
