Commit Graph
1365 Commits
Author SHA1 Message Date
SandPoot 9e8a510ed5 chapter 2: allow right click on action buttons 2023-08-26 21:37:06 -03:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
SandPoot e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
DariusandGitHub 791f89a179 Prevent nutriment pump with no process food trait (#15941)
Prevents the nutriment pump implant from functioning on mobs with TRAIT_NO_PROCESS_FOOD., as this behavior appears to be unintended.
2023-01-14 04:51:42 +01:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
SandPoot 011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
LinandGitHub 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry WesterandGitHub 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
LinandGitHub 7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
SandPoot cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
shellspeed1andGitHub b8f7bb00c9 Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. (#15845) 2022-09-17 13:44:29 -07:00
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
siliconsandGitHub 2865dc6416 Merge pull request #15779 from Linzolle/radial-surgery
radial menu surgery
2022-08-20 12:24:56 -07:00
siliconsandGitHub 4f82820062 Merge pull request #15781 from zeroisthebiggay/breadbay
the great medbay resprite PR: ported from a freshly merged TG PR
2022-08-20 12:24:46 -07:00
SandPoot 6b481d2d66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-19 23:29:29 -03:00
zeroisthebiggayandGitHub a600ea86b9 midround pr get trolled 2022-08-17 00:59:07 -04:00
Linzolle ee3ced89ef less list instantiation man good 2022-08-12 14:27:12 -07:00
Linzolle e5ee36c182 add radial menu to organ manip 2022-08-12 14:11:03 -07:00
zerothebigboy 1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
Timothy Teakettle 5d925412b1 Update organ_internal.dm 2022-08-09 16:37:39 +01:00
Timothy Teakettle e71686d8ac fixes 2022-08-09 11:59:10 +01:00
Timothy Teakettle 818e564c92 stable 2022-08-05 15:44:40 +01:00
Timothy Teakettle 7ed2ee82bf core changes 2022-08-04 14:11:42 +01:00
SandPoot 105251893d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-01 12:45:35 -03:00
Putnam3145 c8e13e2f0b Makes stasis beds fine for surgery 2022-07-30 01:22:58 -07:00
SandPoot 6bff4b4165 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-05 01:38:42 -03:00
deathride58andGitHub ca879a83f5 Merge pull request #15651 from timothyteakettle/oof-ouch-my-bones!
adds paper skin and glass bones quirks
2022-06-05 00:26:55 -04:00
SandPoot d1c44afdae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 19:21:46 -03:00
LinandGitHub 37cd25109e Merge pull request #15634 from deathride58/jukeboxrefresh
Jukebox refresh - Jukebox queue, working volume knob, emagging, preliminary multiz support, and more!
2022-06-01 21:18:02 +00:00
SandPoot 2806f1ef7f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 15:46:12 -03:00
Timothy Teakettle 411a5c63ee paper skin, glass bones 2022-05-29 20:04:49 +01:00
Putnam3145 4af3633d6f Some gas balancing/rearranging 2022-05-24 18:11:58 -07:00
deathride58 5d648fcf6a makes jukeboxes deal hearing loss when too loud, makes being deaf temporarily mute jukebox 2022-05-21 19:23:10 -04:00
SandPoot 89fa5c0bfe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-21 00:13:59 -03:00
LinandGitHub f4dca7caa6 Merge pull request #15631 from timothyteakettle/genitals-get-optimised
optimises genital/tail organs by returning when calling on_life
2022-05-20 19:51:56 +00:00
Timothy Teakettle b245a3d6b8 yes 2022-05-19 20:28:38 +01:00
Timothy Teakettle 275b4ebedd Update _bodyparts.dm 2022-05-17 13:50:23 +01:00
SandPoot 24b740999b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-13 02:48:21 -03:00
LinandGitHub a899b5db81 Merge pull request #15607 from Putnam3145/auxmos-1
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00