Commit Graph
57 Commits
Author SHA1 Message Date
BongaTheProto 2d1d665e41 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
2023-12-16 10:48:35 -05:00
BongaTheProto c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot 36f3edaf4c push 2023-12-10 15:16:51 -03:00
ariaworld 708ad3d128 Revert "modularize"
Demodularizes Photography Album Persistence.

This reverts commit 7ebdfba5c9.
2023-10-24 21:59:22 +02:00
Darius bcf5904b6c Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-08 21:49:37 -05:00
Darius f2cf15c590 Refactor Dumb For Cum quirk
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
2023-02-02 17:21:54 -05:00
BongaTheProto 7ebdfba5c9 modularize
yep
2023-01-30 17:57:24 -05:00
ariaworld f3a2f21070 Fixed tiny typo, missing ". 2023-01-29 19:59:37 +01:00
ariaworld 69a8bc0626 Photography Overhaul. 2023-01-29 19:56:34 +01:00
WoolyAypa 9c94cad910 modularization and removed the is_dumb4cum proc 2022-06-17 14:03:48 -03:00
WoolyAypa af3df23c49 dumb4cum that is 2022-06-17 02:46:28 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons 3c42247870 fix 2021-05-26 20:19:47 -07:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
SandPoot a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
Letter N a38aca4da6 tgui moment. 2020-08-22 13:11:13 +08:00
silicons 7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
silicons db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
siliconsandGitHub aeb6688bc7 Merge pull request #12860 from Sneakyrat6/burnablePhoto
Allows Photos to be Burned
2020-07-23 10:29:10 -07:00
Sneakyrat6 2968963f19 Allows Photos to be Burned 2020-07-21 20:20:51 -05:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
GhomandGitHub 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
GhomandGitHub 85186a9714 Porting updates related to material datums. (#12317)
* Porting updates related to material datums.

* art_type

* oh oh
2020-05-25 14:21:00 -07:00
GhomandGitHub 3ac61c0704 Porting tg painting code. (#12305)
* Porting tg painting code.

* yes.
2020-05-20 18:45:36 -07:00
Ghommie 94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Ghommie 59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
kevinz000 4a537d770d let's make this work 2020-02-19 07:20:16 -07:00
Ghommie a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie 7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Ghommie f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 57cecd2499 work 2019-12-25 06:54:44 +01:00
Ghommie 91e628c73d Ports timestop and sepia extracts improvements/tweaks. 2019-12-06 19:01:42 +01:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie 676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" 2019-07-16 23:15:52 +02:00
Ghommie d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
TrilbyspacecloneandGitHub 8554187075 Update other.dm 2019-02-14 21:02:55 -05:00