Commit Graph

27 Commits

Author SHA1 Message Date
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
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
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
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
BongaTheProto
b21f3bc3e6 this somehow works, ok?
aaa
2022-05-06 15:42:19 -05: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
BongaTheProto
4512705548 Merge remote-tracking branch 'upstream/master' 2022-02-12 02:26:31 -05:00
SandPoot
84b0692962 Makes a bunch of our stuff use balloon_alert() (#228) 2022-02-10 22:50:27 -03:00
BongaTheProto
9a76d328c4 Merge remote-tracking branch 'upstream/master' 2021-12-31 21:17:10 -05:00
SandPoot
9a633b5395 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-12-31 14:07:43 -03:00
BongaTheProto
a8498bd326 now its a config
ghghghgjglgngbg
2021-12-27 16:35:12 -05:00
SandPoot
6790009f7a Size Stuff (#206)
* Upload files

* Update holder_micro.dm

* Upload files
2021-12-09 14:13:27 -03:00