71 Commits

Author SHA1 Message Date
SandPoot cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot f066a260f2 previous could break 2023-01-09 08:05:48 -03:00
SandPoot c94aa43432 quick fix and little extra usage! 2023-01-08 22:02:30 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Hatterhat cd0c2aa496 your jordans are fake 2022-01-02 04:33:25 -06:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
zerothebigboy 30134a0d2f cool 2021-09-01 06:32:33 -04:00
silicons 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons 70c828f74d changes 2021-02-28 00:27:14 -07:00
silicons 178fe9cf55 Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
2021-02-22 13:10:21 -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
keronshb d87ac38e58 Eutactic Blade Restoration + Hyperblade
Brings the Eutatic Blade back to the traitor uplink, same for the Hyperblade.
2021-02-15 21:36:47 -05:00
Hatterhat 96e55d6233 the last bit 2020-10-07 17:50:21 -05:00
Hatterhat 9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
Timothy Teakettle 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons 69335bae0e buff 2020-07-26 17:20:21 -07:00
silicons 0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons 3ab4b62dc1 huh 2020-07-26 17:03:52 -07:00
silicons 279b3e7aed fix 2020-07-26 16:52:16 -07:00
silicons 349874e512 haha 2020-07-26 16:49:47 -07:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle 95b8cd3956 first port 2020-06-10 20:33:01 +01:00
kevinz000 1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom d7954ca077 Yet another PR fixing some issues. (#12424) 2020-06-02 15:29:01 -07:00
kevinz000 1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00
kevinz000 b74d465b6c fix 2020-05-30 01:22:09 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Ghommie c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
kevinz000 6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000 644273beca k 2020-03-16 04:09:25 -07:00
kevinz000 d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000 703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000 9ead492bb0 changes 2020-03-16 00:28:18 -07:00
Ghommie 2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
Ghom 7c8b490cb3 Update energy.dm 2020-03-04 16:40:28 +01:00
kevinz000 0cf7f2e882 Update energy.dm 2020-03-03 21:07:24 -07:00
kevinz000 93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000 8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000 e8ccf4b6d7 fix 2020-02-13 16:25:43 -07:00