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
3ae8edf803
Merge remote-tracking branch 'upstream/master'
2023-01-22 01:06:28 -05:00
Darius
3c4f222e40
Disable thirst for robotic species ( #291 )
...
Adds TRAIT_NOTHIRST to synthetic lizardperson, synthetic anthropomorph, and IPC.
2023-01-21 20:43:11 -03:00
SandPoot
79c8c61459
Makes skirt peeking into an element ( #292 )
2023-01-21 19:30:59 -03:00
zeroisthebiggay
c44a7e4f97
Update examine.dm
2023-01-16 19:17:25 -05:00
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
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
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
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
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
812fcc7e54
New markings and frills ( #262 )
2022-09-27 12:47:59 -03:00
BongaTheProto
49055a7fef
Merge branch 'Sandstorm-Station:master' into master
2022-09-08 10:34:50 -05: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
BongaTheProto
6398d42cad
oop! modularize
2022-07-26 00:13:15 -05:00
Turtle567
4f9a50b2c7
Buff Hiero Club, Chipped King Goat
...
Added +10 damage to all of the hierophant clubs attacks and raised their cooldown by a few seconds, this was needed as the hierophant club was hot ass previously.
Brought the King Goat to the vet and chipped him, he can now be found on any GPS with the "Regal Signal"
2022-07-25 16:47:28 -05:00
BongaTheProto
8edee48740
Merge remote-tracking branch 'upstream/master'
2022-07-15 18:57:20 -05:00
SandPoot
abc70a16dd
kills possible timer subsystem killer and stupid code that doesn't stop overflowing overlays for **** sake
2022-07-15 20:04:42 -03:00
BongaTheProto
04d9c7d167
Merge remote-tracking branch 'upstream/master'
2022-06-04 13:25:54 -05:00
SandPoot
461bfc3f9c
Fixing some stuff about sizecode ( #257 )
2022-06-03 19:45:19 -03:00
BongaTheProto
c0530b3650
Merge branch 'master' into prefs-update
2022-05-19 10:48:20 -05:00
BongaTheProto
2a481ecea8
Merge branch 'Sandstorm-Station:master' into master
2022-05-19 08:42:54 -07:00
SandPoot
d0022f08bc
No.
2022-05-19 11:57:25 -03:00
BongaTheProto
b59cbac7a0
Update sif.dm
...
I hate these too but I hate even more the unnecessary warnings in my vscode
2022-05-09 07:27:55 -05:00
BongaTheProto
6306d05a18
Merge branch 'master' into prefs-update
2022-05-08 15:23:53 -05:00
Toxici11i
8f91555dd7
Massive update.
...
Signed-off-by: Toxici11i
2022-05-06 22:29:33 +01:00
BongaTheProto
b21f3bc3e6
this somehow works, ok?
...
aaa
2022-05-06 15:42:19 -05:00
AManWithAToolbox
dda0869f82
Merge branch 'pr/1' into its-wasnt-gonna-happen
2022-04-18 23:19:18 -05:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
BongaTheProto
557fbe7803
back home
...
this works apparently...?
2022-04-18 21:19:35 -05:00
nullfag
aad3c9cc6c
the fuckening
2022-04-18 00:52:36 +02:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
4f467897e3
fix for our stuff
2022-04-09 03:01:10 -03:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
