Commit Graph

173 Commits

Author SHA1 Message Date
BongaTheProto
f60fafb3d8 Merge remote-tracking branch 'upstream/better-size-code' into better-size-code-splurt 2021-11-21 00:03:18 -05:00
SandPoot
b174c45821 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 2021-11-17 22:06:47 -03:00
SandPoot
37e2461945 i forgot this!! aaaaaa 2021-11-17 22:06:40 -03:00
SandPoot
6025ef041b Updates some lewd stuff again (#195) 2021-11-17 15:21:16 -03:00
SandPoot
f753617a0b Updates some lewd stuff (#189) 2021-11-03 13:59:02 -03:00
SandPoot
983fc006a3 Makes interactions generation into a subsystem (#188)
* Upload files

* Update interactions.dm
2021-11-01 00:27:07 -03:00
SandPoot
32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPoot
f94c76bea6 Adds fleshlights (#187)
* Upload files

* Update files

* Update objects.dm

nobody saw this shameful webedit.
2021-10-12 23:00:03 -03:00
SandPoot
6677dfa687 Adds tabs to the interaction menu (#180) 2021-09-06 16:33:35 -03:00
SandPoot
ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
SandPoot
dd09f0b785 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-19 02:57:23 -03:00
SandPoot
e3aeaa173d Updates Interactions (#168) 2021-06-19 00:24:32 -03:00
SandPoot
38bdb3cca3 Many underwear changes (#156)
* upload files

* upload files
2021-04-17 21:04:24 -03:00
SandPoot
27266c67ed A major fix for interactions that can break it a lot (#155) 2021-04-13 23:03:14 -03:00
SandPoot
6d7475881b Some finishing touches at interactions (#153)
* upload files

* Space is required before '}'  object-curly-spacing

* 50:48  error  Missing trailing comma  comma-dangle
2021-04-11 16:02:16 -03:00
SandPoot
aeb14c0a15 TGUI's your interactions (#152)
* upload files

* some indents and keys?

* wrong again?

* indent pain

* 1 error left

* this is joking
2021-04-10 13:16:56 -03:00
SandPoot
6f15641f33 Thirst (#151)
* upload files

* upload files

* upload examine.dm

* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
2021-04-03 19:54:56 -03:00
SandPoot
96fc996306 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into better-size-code 2021-02-17 17:43:53 -03:00
SandPoot
30f4078914 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-08 11:54:08 -03:00
SandPoot
3aa7554135 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-06 20:36:07 -03:00
SandPoot
7d4429e21a upload files 2021-01-23 20:00:54 -03:00
SandPoot
c15a3b7a4e changes some comments and var paths to be better? 2021-01-19 13:01:45 -03:00
Maksxpl
c8082e1009 Compliance with standards (#134)
* enjoy

* Update shuttles.dm

sowwy

Co-authored-by: Maksxpl <18237380+maksxpl@users.noreply.github.com>
2021-01-19 12:44:08 -03:00