shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,384 Commits 5 Branches 0 Tags
d287fc25ca262fc89dd5905bf4e28c55d53e575a
Commit Graph

10305 Commits

Author SHA1 Message Date
SandPoot
d287fc25ca poosh 2023-02-21 01:55:49 -03:00
SandPoot
2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy Teakettle
71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips 
Contextual screentips -- Screentips now show you what items/objects can do
 2023-02-15 23:04:54 +00:00
Timothy Teakettle
5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork 
Re-Adding Bounty Consoles
 2023-02-11 00:06:37 +00:00
SandPoot
8ea39f9cf4 helpers 2023-02-10 00:39:04 -03:00
Timothy Teakettle
390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip 
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
 2023-02-09 21:39:05 +00:00
SandPoot
78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03:00
SandPoot
4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
SandPoot
1b1154260c correct everything and some intention based checks 2023-02-08 02:17:57 -03: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
SandPoot
5052f836e7 the stuff 2023-02-06 19:54:54 -03: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
SandPoot
ed06e686e1 pushies. 2023-01-31 16:40:17 -03: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
469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui 
Event menu rewrite
 2023-01-29 13:46:39 -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
SandPoot
54641ce201 send 2023-01-23 20:44:28 -03:00
Lin
bd6a170299 Merge pull request #15943 from SandPoot/silicon-stuff 
Update some silicon stuff
 2023-01-18 17:52:06 -07:00
SandPoot
0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
President of Shit PRS
d063144713 Re-Adding Bounty Consoles 
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
 2023-01-14 02:01:12 +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
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
SandPoot
cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7 element time 2023-01-10 18:08:17 -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
Lin
efb2d19cb9 Merge pull request #15921 from LeDrascol/port-furrypride-graffiti 
[PORT] Furry Pride graffiti
 2023-01-07 16:38:34 -07:00
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08: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
Darius
4bea655c8b Port Furry Pride graffiti 
Ports the large "Furry Pride" graffiti from TG.
 2023-01-05 17:38:02 -05:00
Lin
b5d794a6b3 Merge pull request #15916 from LeDrascol/mop-sprite-fix 
Fix Advanced Mop inhands sprite
 2023-01-04 21:50:54 -07: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
Darius
e5813bec20 Play BSLR effects only when replacing 
Prevents the Bluespace Light Replacer from playing sounds or displaying a beam when the target's light won't be replaced. Based on the BSRPED's behavior.
 2023-01-03 14:36:56 -05:00
Darius
7dc500e526 Fix Advanced Mop inhands sprite 
Restores the sprite to it's unique advmop variant, and fixes a sprite order issue.
 2023-01-03 13:10:48 -05:00
Darius
d3e018720c Port the Bluespace Light Replacer 
- Ports the Bluespace Light Replacer from TG
-- Added to Applied Bluespace Research instead of Advanced Sanitation Technology
- Makes the basic Light Replacer a default tech node
 2022-12-24 15:57:11 -05:00
Jerry Wester
d3c72669d9 clean up & remove longfall boots 2022-12-20 02:03:45 -07:00
Jerry Wester
b1b4f96053 fix hilbert analyzer in RD locker 2022-12-17 20:10:41 -07:00
Darius
bcae0e66ff Fix init_process not preventing processing 
Prevents machines from running faster when set to both not init_process and not speed_process.

Changes mineral machine to init_process to fix potential issues caused by this.
 2022-12-16 16:25:45 -05:00
Jerry Wester
b52e7a5657 ion jetpack module 2022-12-14 23:36:47 -07: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
Jerry Wester
19428e2579 revert bag dumping changes 2022-12-13 19:15:07 -07:00