shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,392 Commits 5 Branches 0 Tags
5f0739b216ec0c78c9f23d3f86a11dcecbee3160
Commit Graph
2912 Commits
Author SHA1 Message Date
SandPootandGitHub 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy TeakettleandGitHub 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 TeakettleandGitHub 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 4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -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
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
siliconsandGitHub 469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui 
Event menu rewrite
 2023-01-29 13:46:39 -08: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 a56247f828 oops? 2023-01-28 01:18:35 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
SandPoot 54641ce201 send 2023-01-23 20:44:28 -03:00
Timothy TeakettleandGitHub 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
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
siliconsandGitHub 23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
Jerry Wester d3c72669d9 clean up & remove longfall boots 2022-12-20 02:03:45 -07:00
Jerry Wester 13f8559190 add springlock module 2022-12-17 16:54:41 -07: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
Jerry WesterandGitHub 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
LinandGitHub f758a55da3 Merge pull request #15885 from BlueWildrose/pins 
Pins, New Loadout Category, CTRLclick for accessory above suit
 2022-12-12 19:12:53 -07:00
Jerry Wester a4631070a8 revert some changes 2022-12-11 20:32:42 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaosandJerry Wester 183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
Darius f5cf485321 Separate max age from max age input 
The maximum character age a user can manually input is now defined by AGE_MAX_INPUT instead of AGE_MAX. These values are identical by default.

Also reverts the change to dialog box text.
 2022-12-09 08:00:19 -05:00
Cognition b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
siliconsandGitHub 268184347a Merge pull request #15875 from JerryWester/revert-15869-feat/drider-webs 
Revert "Grant Arachnid Abilities to Driders"
 2022-11-03 22:52:38 -07:00
LinandGitHub 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Jerry WesterandGitHub aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
siliconsandGitHub 2ec0e810fc Merge pull request #15869 from JerryWester/feat/drider-webs 
Grant Arachnid Abilities to Driders
 2022-10-18 21:17:03 -07:00
siliconsandGitHub f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties 
Port of public bounties and the sales tagger from tg.
 2022-10-12 03:27:37 -07:00
Jerry Wester 1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
siliconsandGitHub 93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
siliconsandGitHub a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou 
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
 2022-09-23 16:27:03 -07:00
siliconsandGitHub ef38bc5522 Merge pull request #15858 from Putnam3145/auxmos-2 
Updates auxmos to 2.0.0
 2022-09-23 16:20:31 -07:00
siliconsandGitHub a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition 
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
 2022-09-23 16:16:03 -07:00
shellspeed1 b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
Putnam3145 eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-18 16:41:24 -07:00
Putnam3145 d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
shellspeed1 3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
shellspeed1andGitHub 236e9e5e0c ports launchpad targeting icon. (#15844) 2022-09-17 13:40:32 -07:00
shellspeed1GitHubPutnam3145SandPoot
 		d9e15776ee Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) (#15847) 
* sprites and sounds

* The code for the reactor itself

* Update code/modules/power/reactor/rbmk.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update code/modules/power/reactor/rbmk.dm

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

* Map stuff

* Removes Clamps.

* Matrices separated, this was a mistake on my part.

* Update tgstation.dme

* removal as per putnam's review

* redfines highest available as 1007

* possible soundloop fix? probably not.

* temporary config thing to make engine load

* changes to map template from splurt

* Update code/modules/power/reactor/rbmk.dm

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

* Update code/modules/power/reactor/rbmk.dm

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

* actually somehow fixed the runtimes?

* old maps from hyper, not needed..

* Revert "old maps from hyper, not needed.."

This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.

* take two on removal

* fixes power output

* Update code/modules/power/reactor/rbmk.dm

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

* Update code/modules/power/reactor/rbmk.dm

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

* deals with the double turf

* Revert "temporary config thing to make engine load"

This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.

* was told to bring it back

* don't need to change these

* next time I'll just copy paste it instead of type it.

* a

* Flexi Seal crate so we can fix the reactor

* set power to 0 so it can be fixed

* nerfs power output

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2022-09-17 13:33:51 -07:00
shellspeed1 11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1 bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
shellspeed1 1130a9341e now it actually works 2022-09-09 20:02:45 -07:00
shellspeed1 f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1 fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
Putnam3145 3700b9bbe5 Allows setting antags to "low" 2022-08-21 16:42:39 -07:00
siliconsandGitHub 18b797d0f4 Merge pull request #15758 from LetterN/patch-12 
fix pod not unlocking on code delta
 2022-08-20 12:27:11 -07:00