cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,821 Commits 55 Branches 0 Tags
b478367fd913b9760985761a914e8c9c97acb861
Commit Graph

2367 Commits

Author SHA1 Message Date
SandPoot
dc08550162 push 2024-08-25 04:38:03 -03:00
deathride58
c2e72943c0 Merge pull request #16094 from SandPoot/xor 
Xor gate for circuitry
 2024-07-06 18:17:14 -04:00
SandPoot
9c92081471 push 2024-07-06 01:11:49 -03:00
SandPoot
e5a9280ad3 push 2024-07-04 23:44:35 -03:00
Elizabeth Lavenza
62471713f1 Fix missing shipping box overlay 2024-04-16 02:18:18 -04:00
Elizabeth Lavenza
86c1a2eeaa Fix invalid gun overlays 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza
014de0364d Fix cyborg welding tool icons 2024-04-13 20:14:19 -04:00
deathride58
dd8c641520 Merge pull request #15486 from SandPoot/kills-cache 
Solves issues with overlays by updating the whole subsystem
 2024-04-12 23:31:54 -04:00
SandPoot
6b1e0b300a fudge 2024-04-12 23:33:43 -03:00
SandPoot
5aa8ada82d dice sides 2024-04-12 23:07:57 -03:00
SandPoot
4af0628c8b woo 2024-04-12 22:36:44 -03:00
SandPoot
dfe90dfb61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486 2024-04-12 20:48:41 -03:00
SandPoot
984d7ffe9a holiday and quirk support 2024-04-10 22:51:25 -03:00
SandPoot
ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot
4797a49914 Update files 2023-10-13 16:40:45 -03:00
SandPoot
af33de25b4 the commit 2023-10-03 14:22:05 -03:00
Jerry Wester
31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05: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
silicons
6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo 
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
 2023-03-04 23:36:36 -08:00
SandPoot
b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
Timothy Teakettle
7e77bc8023 Merge pull request #15963 from zeroisthebiggay/sickkicks 
sick kicks: tg/skyrat boot sprite theft
 2023-02-03 09:54:04 +00:00
Timothy Teakettle
f40584685b Merge pull request #15952 from zeroisthebiggay/sabre 
very ready sabre resprite and minor sprite tweaks
 2023-02-03 09:53:15 +00:00
Timothy Teakettle
560fbd3ffb Merge pull request #15956 from zeroisthebiggay/posters 
poster resprite bottom text
 2023-02-03 09:52:48 +00:00
zerothebigboy
d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
Timothy Teakettle
6723c0166e Merge pull request #15960 from zeroisthebiggay/glasses 
the tg gloves resprite
 2023-02-01 00:53:42 +00:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
zerothebigboy
c17c7fd53b realest 2023-01-29 22:56:35 -05:00
zerothebigboy
8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy
c99b22fe32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre 
# Conflicts:
#	icons/obj/items_and_weapons.dmi
 2023-01-29 21:59:01 -05:00
silicons
bb7f6d1766 Merge pull request #15944 from LeDrascol/fix-sprite-drink-filling 
Fix drinking glass sprite issues
 2023-01-29 13:45:48 -08:00
zerothebigboy
e76221f68b yeppers 2023-01-29 03:57:32 -05:00
zerothebigboy
b8bc94ba13 man 2023-01-29 00:49:55 -05:00
SandPoot
44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot
c60f36a42b files 2023-01-28 01:10:49 -03:00
zerothebigboy
4f034eadc1 yep 2023-01-26 05:54:51 -05:00
zerothebigboy
2cfa2c34a6 yep 2023-01-26 04:11:41 -05:00
Darius
6a4ffcbc29 Fix drinking glass sprite issues 
- Fixes overlays for the drinking glass and shot glass
- Improves overlays for glassbottle and glassbottlesmall
- Removes duplicate fernetpuro and godlyblend icons
 2023-01-19 11:54:49 -05:00
Lin
6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat 
Adds the Polychromatic Cowboy Hat
 2023-01-18 18:11:21 -07:00
Timothy Teakettle
36ae492e50 Merge pull request #15915 from LeDrascol/update-drink-sprites 
[PORT] /tg/station Drink Sprites
 2023-01-16 23:09:43 +00:00
Timothy Teakettle
35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update 
[PORT] Non-global heirloom definitions
 2023-01-12 23:39:41 +00:00
Darius
a8b7cd9c4a Adds the Polychromatic Cowboy Hat 
Adds a new polychromatic variant of the white cowboy hat.
 2023-01-10 20:40:01 -05:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
silicons
e292452aae Merge pull request #15908 from Hatterhat/glasses 
loadout - glasses and price adjustments
 2023-01-07 14:10:35 -08:00
silicons
35497b250f Merge pull request #15914 from Hatterhat/conveyor-sorter 
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
 2023-01-07 14:09:55 -08:00
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
SandPoot
70b7d35da9 Merge pull request #15899 from LeDrascol/port-alien-tools-resprite 
[PORT] Abductor surgical tools resprite
 2023-01-07 15:50:34 -03:00
Darius
d90fa375e1 Move heirloom lists to relevant files 
Port of the current TG heirloom system.

Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.

Also fixes the ancient first aid kit, which is used for a heirloom.
 2023-01-04 13:57:54 -05:00
Lin
1401959cc9 Merge pull request #15911 from Hatterhat/prescription 
prescription kits, aka the eyewear accessibility update
 2023-01-01 22:52:21 -07:00
Darius
ca3e4f6d14 Update drinks with new TG sprites 
Port of all tgstation drink sprites. Not all sprites are used in the main branch.
 2023-01-01 08:48:53 -05:00
Hatterhat
34eaf93a01 sorters! one-way setting! brazen code borrowing! 2022-12-29 20:18:34 -06:00