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

406 Commits

Author SHA1 Message Date
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03: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
Cognition
b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
zerothebigboy
4cd74e3b31 thighjob from a girl wearing a microskirt who can beat the shit out of you whenever 2022-08-21 20:55:37 -04:00
zerothebigboy
44275e7493 i am thoroughly erect 2022-08-14 21:58:48 -04:00
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04: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
silicons
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
BlueWildrose
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
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
LetterN
fe6556f7b7 grrrrrr 2021-11-22 15:29:57 +08:00
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
LetterN
99019166e4 i think it works 
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
 2021-10-30 11:45:50 +08:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
keronshb
6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb
95bb14bb67 Adds the missing hats, missing wings, and clothes to vendor. 2021-10-15 16:59:16 -04:00
keronshb
e5f66413c8 fat dart 
no idea what this even is
 2021-10-08 17:28:25 -04:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
silicons
cd579124cb Merge pull request #15188 from buffyuwu/clothingupdate1 
ports/adds more edited clothing
 2021-09-28 00:15:23 -07:00
buffyuwu
dbd6014129 adds art supplies to the fun vendor 
because some maps don't have the canvas/easel

🆑
add: canvas and spraycan are now sold in the fun vendor
/🆑
 2021-09-21 01:16:03 -04:00
buffyuwu
eb43981dea adds 4 loadout jackets 
more clothing ported from RP/existing TG assets with minor edits on some. available in loadout for pre-round selection and character customization.

also fixes flannels by porting additional sprites so they can now be closed/opened. note: this changes some of the flannel /obj/ paths from example: /obj/item/clothing/suit/jacket/flannel/brown
TO
/obj/item/clothing/suit/toggle/jacket/flannel/brown

🆑
fix: flannels can now be toggled in style
add: ports more rp and existing tg assets with minor edits into loadout
/🆑
 2021-09-20 19:04:47 -04:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
WanderingFox95
c8889dee36 Bottles. 2021-08-17 14:21:55 +02:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Putnam3145
975582380b always search when you change paths 2021-07-25 18:52:01 -07:00
zerothebigboy
a395fc1b52 a 2021-06-12 19:58:53 -04:00
keronshb
77d302f8f6 Ports Swag Outfit 2021-05-24 12:47:55 -04:00
silicons
898d1d2c7f Merge pull request #14731 from WanderingFox95/WanderingFox95-Efink 
The E-Fink (Yes, really)
 2021-05-18 17:08:58 -06:00
WanderingFox95
7cbe105061 Efink 2021-05-17 12:34:38 +02:00
zerothebigboy
37873d6750 gommit 2021-05-15 08:52:24 -04:00
silicons
e8b7abcfc6 Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin 
The Unrolling Pin! (Ready)
 2021-05-07 18:40:33 -06:00
keronshb
834ec62c0b Nightmare Jaunt Change 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-03 00:05:39 -04:00
WanderingFox95
7d6da9a9fd Adds it to the vendor 
so you can buy it
 2021-04-26 18:41:34 +02:00
Blue Wildrose
fcd1080069 more booby and dick pill 2021-04-01 05:36:43 -07:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
Letter N
7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
4ba9df18de Merge pull request #14279 from Adelphon/boon 
bugfix
 2021-02-21 14:53:39 -07:00
Adelphon
f795d007a9 bugfix 2021-02-20 18:18:27 -05:00
Putnam
257cd6bb34 keyword argument funnies, whoops comma 2021-02-18 21:55:28 -08:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00