cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 21:27:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,788 Commits 8 Branches 0 Tags
modsuit-update
Commit Graph
2287 Commits
Author SHA1 Message Date
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 15d52e5b15 update content 2023-06-20 15:39:24 -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
SandPootandGitHub 0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
Timothy TeakettleandGitHub c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning 
Update to reskinning
 2023-01-11 01:00:35 +00:00
SandPootandGitHub 2a772c8482 Adds the commando skin from ror & ror2 to the mining hardsuit (#280) 
* first commit with everything

* quick fix and little extra usage!

* the boy

* previous could break

* better head
 2023-01-09 18:55:07 -03:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -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
Jerry Wester 13f8559190 add springlock module 2022-12-17 16:54:41 -07: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
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
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
Putnam3145 e1cfa92080 fixes the worst use of a for loop ever 2022-09-13 23:19:12 -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
Putnam3145 9998ca7a10 another funny space cleaner gas buff 2022-08-18 23:54:01 -07:00
Putnam3145 c8a84c2172 forgot the ..() 2022-08-15 23:42:42 -07:00
Timothy Teakettle 835323bdbc neurine fixes your traumas, yo! 2022-08-09 12:07:09 +01:00
Putnam3145 cdcdc11d9b more space cleaner per space cleaner 2022-08-07 22:05:37 -07:00
Putnam3145 cda032a2dc this wasn't even a copy+paste error, it's unaccountable 2022-08-06 22:53:00 -07:00
Putnam3145 c0073370b2 more chem gases 2022-08-06 22:42:58 -07:00
Putnam3145 f7bb3f3050 makes drying agent a chem gas 2022-08-06 16:08:55 -07:00
SandPoot 0a0e4de14b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 02:59:28 -03:00
Cognition 70dbad7055 Tea dispensing fix 2022-07-22 12:19:54 -06:00
SandPoot d1c44afdae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 19:21:46 -03:00
deathride58 20eb61b319 makes slimes specifically have overlay-blended blood! 2022-05-26 22:56:10 -04: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
SandPoot 61679d8141 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-02 21:05:34 -03:00
siliconsandGitHub 73741102ac Merge pull request #15606 from timothyteakettle/salt-quirk 
an actual salt pr (adds sodium sensitivity quirk)
 2022-05-02 17:02:23 -07:00
SandPoot 41949a8be1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-29 13:24:42 -03:00
Putnam3145 a7408beb4c Updated auxmos to 1.0 2022-04-28 21:07:51 -07:00
Timothy Teakettle ac4a41243a add salt quirk 2022-04-27 14:58:54 +01:00
Putnam3145 b5ce67ce55 Weird reaction stuff 2022-04-26 01:14:41 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
siliconsandGitHub da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload) 
Every case of initialize that should have mapload, does
 2022-04-15 17:41:57 -07:00
BlueWildroseGitHubDeltaFire
 		f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053) 
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2022-04-15 00:37:08 +02:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -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
siliconsandGitHub dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 282941ca5b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-31 00:21:11 -03:00
BlueWildroseGitHubSandPootPutnam3145
 		3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304) 
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-03-30 20:06:00 -07:00