Commit Graph

183 Commits

Author SHA1 Message Date
deathride58 0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot e457f40328 maptext 2023-12-11 17:43:24 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Hatterhat e9ff5e00e0 works on my machine 2023-01-11 20:49:26 -06:00
Hatterhat e2b476ffa8 guess i forgot this 2023-01-11 18:33:34 -06:00
silicons e292452aae Merge pull request #15908 from Hatterhat/glasses
loadout - glasses and price adjustments
2023-01-07 14:10:35 -08:00
Hatterhat 062cbaed29 wow does that actually compile 2022-12-29 19:34:14 -06:00
Hatterhat 3324f3a46c whitespace fix 2022-12-26 09:26:04 -06:00
Hatterhat d9b431ab91 disposable 2022-12-26 03:53:56 -06:00
Hatterhat 4fa0527ba7 forgot to add The Lore so no lore 2022-12-26 03:46:48 -06:00
Hatterhat ab827ff8dc accessibility or some shit ig 2022-12-26 03:45:26 -06:00
Hatterhat c54ed0ceda overstepped the scope tbh 2022-12-24 01:44:03 -06: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
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb 41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
keronshb 0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
necromanceranne 0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
zerothebigboy 165966ffeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	icons/mob/clothing/suit.dmi
2021-02-28 22:13:00 -05: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
zeroisthebiggay c3f0d0b9c8 fixes some bullshit assery
fixes some bullshit assery
2021-02-10 20:40:39 -05:00
zeroisthebiggay e530e8d103 god i hate this
god i hate this
2021-02-10 13:05:21 -05:00
Timothy Teakettle 1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
silicons a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
Lynxless 14e35806b9 I hope this works 2020-08-07 16:23:15 -03:00
Timothy Teakettle 5f8ed3ee3a acidproof 2020-08-03 22:14:42 +01:00
Timothy Teakettle 3a0b34fb1b funny aim go brr 2020-08-03 21:58:58 +01:00
Timothy Teakettle 6fdfc19ea0 why can i not spell 2020-08-03 17:39:45 +01:00
Timothy Teakettle da05108dd0 woops 2020-08-03 17:37:58 +01:00
Timothy Teakettle 2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01:00
Timothy Teakettle 34e2bd626f woops 2020-08-03 14:50:19 +01:00
Timothy Teakettle 0bf9553eca hmm 2020-08-02 19:13:39 +01:00
Timothy Teakettle 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons 910869d6bf more 2020-07-18 19:44:12 -07:00
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Ghom 968426fd48 Combat mode component. (#12338)
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
kevinz000 e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676
Fixes the phantom thief component, again
2020-04-14 01:34:18 -07:00
Ghommie 42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +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
Ghom 13f9c3c235 Update phantomthief.dm 2020-04-12 08:03:30 +02:00
Ghommie acb5c39b59 Fixes the phantom thief component for the Xth time. 2020-04-12 07:47:28 +02:00
Ghommie 2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" 2020-03-30 18:31:26 +02:00