cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-18 11:44:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph

1382 Commits

Author SHA1 Message Date
SandPoot a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -03:00
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot bc0dc5ee02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-12 19:54:43 -03:00
SandPoot 0fd4dba15b push 2024-08-11 14:10:35 -03:00
SandPoot fc53ab850c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-14 20:15:08 -03:00
Elizabeth Lavenza 174aca4b01 Port set_stat and COMSIG_MOB_STATCHANGE from TG 2024-04-13 18:06:52 -04:00
deathride58 f38172182d Merge pull request #16058 from SandPoot/remove-cyborg-safety 
Removes cyborg surgery safety that messes with other medical instruments
 2024-03-30 17:58:40 -04:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03: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 fcd036dab5 final stuff, i think? 2024-03-07 20:31:53 -03:00
SandPoot ee4d35ad32 here 2024-02-05 14:59:20 -03:00
SandPoot 354ef121b0 solve cyborgs cannot scan with health analyzer 2024-02-05 14:14:36 -03:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -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 a558377206 more stuff i can't guarantee works by itself yet 2023-11-29 23:37:15 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -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
Darius 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 Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
silicons 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
Lin 7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
Jerry Wester 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
Lin 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
shellspeed1 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
silicons 2865dc6416 Merge pull request #15779 from Linzolle/radial-surgery 
radial menu surgery
 2022-08-20 12:24:56 -07:00
silicons 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
zeroisthebiggay 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