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-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,218 Commits 55 Branches 0 Tags
21c3abdfb7ad02be849653db5a17a043cdced542
Commit Graph

32228 Commits

Author SHA1 Message Date
BongaTheProto
21c3abdfb7 Merge remote-tracking branch 'upstream/master' 2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
BongaTheProto
68649df86c optimized some copypasted code (#285) 
* less copypaste = good

* fix

* Update lewd_definitions.dm

oops
 2023-01-17 07:59:18 -03:00
Darius
ad0239b5de Replace all modular HTML spans with defines spans 
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
 2023-01-16 04:05:27 -05:00
BongaTheProto
41e15dd097 follow-up 
I HOPE this doesn't break stuff
 2023-01-16 02:20:22 -05:00
BongaTheProto
596ab81dd0 Merge remote-tracking branch 'upstream/master' 2023-01-16 01:06:20 -05:00
Lin
c73df1efb9 Merge pull request #15937 from LeDrascol/ptech-all-carts 
Add all missing job cartridges to PTech
 2023-01-15 15:34:28 -07:00
Lin
a00bb99936 Merge pull request #15934 from LeDrascol/update-lumi-eyes 
Minor improvements to High Luminosity Eyes
 2023-01-15 15:34:21 -07:00
SandPoot
0fe80e9234 Puts span defines on sandstorm's strings (#284) 2023-01-15 00:40:48 -03:00
Crowbar764
9098fbee8d Update code/game/objects/structures/electricchair.dm 
Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
 2023-01-15 03:01:03 +00:00
Casper
ae399d1d7c Fixes e-chair and shockkit runtimes. 2023-01-14 22:13:00 +00: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
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
Timothy Teakettle
6f1e2120f1 Merge pull request #15935 from LeDrascol/quirk-remove-colorist 
Convert Colorist from quirk to loadout item
 2023-01-12 23:32:03 +00:00
Darius
b25248d7ae Add all job cartridges to PTech 
Adds all remaining unavailable job cartridges to the Head of Personnel's PTech vending machine. Carts are sorted by standard job, virus, then command.
 2023-01-12 00:13:42 -05: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
Darius
aa1b82f0b1 Convert Colorist from quirk to loadout item 
Removes the Colorist quirk, and adds Hair Dye Spray to the loadout under backpack items.
 2023-01-11 14:23:14 -05:00
Darius
045eb4a8c9 Add quirk removal code for High Luminosity Eyes 
Restores the character's default eyes when removing the High Luminosity Eyes quirk. Ensures that the character has eyes, and that those eyes are luminescent.
 2023-01-11 13:41:21 -05:00
Darius
d6ddb68c6f Minor updates to High Luminosity Eyes flavor text 
This commit does the following:
- Fixes minor typos
- Increases the amount of information presented
- Adjusts flavor text to be more specific
 2023-01-11 13:39:00 -05:00
BongaTheProto
86a005b590 Merge remote-tracking branch 'upstream/master' 2023-01-11 12:51:40 -05:00
SandPoot
03304ba2c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-10 22:50:16 -03:00
Timothy Teakettle
c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning 
Update to reskinning
 2023-01-11 01:00:35 +00:00
SandPoot
3b8d102fac puts pda in the system to remove shitcode 2023-01-10 20:02:12 -03:00
BongaTheProto
ebbb0ad08c Merge remote-tracking branch 'upstream/master' 2023-01-10 16:51:46 -05:00
SandPoot
cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7 element time 2023-01-10 18:08:17 -03:00
Darius
7fdaa58689 Fix latejoin panel slot displays (#281) 
Fixes a redundant display of job slots on the latejoin panel, caused by non-modular edits.
 2023-01-10 08:23:38 -03:00
BongaTheProto
7d5fbe0412 the glooby update 
very slimy!
 2023-01-10 03:36:39 -05:00
BongaTheProto
d6aa3acbd4 Merge remote-tracking branch 'upstream/master' 2023-01-09 17:08:06 -05:00
BongaTheProto
ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05:00
SandPoot
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
543b18c435 oops shrug 2023-01-09 17:55:51 -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
f066a260f2 previous could break 2023-01-09 08:05:48 -03:00
SandPoot
c94aa43432 quick fix and little extra usage! 2023-01-08 22:02:30 -03:00
SandPoot
f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot
d527d28ef7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 22:58:19 -03:00
SandPoot
82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Lin
efb2d19cb9 Merge pull request #15921 from LeDrascol/port-furrypride-graffiti 
[PORT] Furry Pride graffiti
 2023-01-07 16:38:34 -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
ad479f738e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 16:45:16 -03:00
SandPoot
42d4abc164 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 16:44:44 -03:00
SandPoot
183eaf8a68 come on, the signal positions! 2023-01-07 16:34:23 -03:00
SandPoot
c3d6816780 Merge pull request #15577 from Putnam3145/bring-beauty-back 
Adds beauty back
 2023-01-07 15:58:46 -03:00
SandPoot
535c1c623e Merge pull request #15896 from LeDrascol/fix-machine-init-process 
Fix init_process not preventing processing
 2023-01-07 15:44:58 -03:00
SandPoot
4799d24d67 Merge pull request #15919 from LeDrascol/latejoin-slot-totals 
Display job slots out of total during late-join
 2023-01-07 15:40:52 -03:00