shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,624 Commits 5 Branches 0 Tags
5aa9dd7c1472df755da42bbecf2e1ede677bb00a
Commit Graph

603 Commits

Author SHA1 Message Date
deathride58
943cc7d969 Apply suggestions from code review 
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
 2019-03-05 00:30:06 -06:00
Poojawa
02d7dc4f7f oh right that's a snowflake var 2019-03-03 00:24:38 -06:00
Poojawa
4255a22697 Removes Mime insulting 2019-03-02 23:53:05 -06:00
kevinz000
bb84b911f5 Merge pull request #8054 from deathride58/merp 
Adds merp as an emote
 2019-03-01 02:29:42 -08:00
kevinz000
10675c9347 Merge pull request #8055 from Poojawa/darkdoggos 
Dark Medihound varient & Pup Dozer skin for EngiBorg
 2019-03-01 02:29:26 -08:00
Poojawa
ccc1bed822 Adds varients to Alina's donation item 2019-02-28 08:55:48 -06:00
Poojawa
df889dceec there is no dark side 2019-02-27 21:57:15 -06:00
kevinz000
24fd5600b7 Merge pull request #8042 from izzyinbox/dog-sprites 
Dog sprites
 2019-02-27 16:19:42 -08:00
Ghom
704d7403ac Tweaking some cyborg mounted energy guns. (#8037) 
* You get yourself a bottle and say, "I don't love anything anymore."

* the sunset.

* I'm nuclear gun, I'm wild.
 2019-02-27 16:02:33 -08:00
Poojawa
50dbed4f11 Dark Medihound and PupDozer 2019-02-27 01:44:54 -06:00
deathride58
f6a35c285a Adds merp as an emote 2019-02-27 01:50:50 -05:00
Poojawa
96bdb7b058 Adds Alina borg appearance 2019-02-26 02:47:16 -06:00
izzyinbox
6ed9cdc8f6 adds generic dog body marking sprites 2019-02-25 02:59:36 -06:00
deathride58
7cc463a190 fixes the bug where you can sometimes get permanently stuck sprinting when using the sprint hotkey (#8033) 2019-02-22 06:09:41 -08:00
Poojawa
b393789f19 Character Creation Overhaul (#7987) 
* Rebase fail. good thing I made back ups. c:

* Tails more or less done

* wouldn't update cleanly otherwise

* It's completly working now. holy fuck I did it

Just need the refurbished body markings done, then to chop 'em up for full PR status

* MARKINGS DONE AAAAAAAAAAAAA

* fixes digi legs that didn't convert correctly

* ports the refractored preferences

Kinda ugly now tbh. but fuckit

* quality sweep, things should should properly now in general

* Taurs converted and improved! BODYMARKING -> MATRIXED

* oops. s'what I get for not compile checking

* remember to throw shade at furries

* vigorously update markings upon switching species and colors

* re-adds old wolf ears, Big Wolf fixes snout bugs

* few more snout tweaks

* cut the lists, cut everything. reeee

* This code I s2g

* Adds context clues to preferences

Hopefully people will read them before making an OOC fuss

* Fixes hands and feet markings with this one weird trick

remember kids, proper layering and order of operations is important

* Sprite tweaking and polishing

Sergal stuff being worked on

* a few QoL things for species swapping

* how the fuck did I miss these markings

* fleshes out sprites in preperation for marking experimentation later

* fixes catboy problems

* Mam_snout is a thing now,

* pixel adjusted tails, cleaned up wah tail a bit better

also gets digitgate legs missing pixels fixed

* cleans up more shit. ree

* force "plain" instead of none to avoid missing pixel reports

* tweaks to reinspire mapdiff

* Clean up Preference UI

Looks a little better now

* k

* doubly ensure None markings aren't valid

* reee spessman barbie

* brightens pixels around tiger head markings

* YEENS

* Cat ears tweaked because it triggers Kev otherwise

* another session of quality control

* Crows and crow accessories

* husk fixes

* works good enough, mission accomplished

* fixes the proc properly

* cleans up brute force code that isn't needed

* c a t
 2019-02-22 05:59:05 -08:00
deathride58
74c87b3d56 Merge pull request #8001 from Citadel-Station-13/revert-7986-patch-2 
Revert "Adds realism to pleasure" - "Kev people are two hitting each other with sex circuits"
 2019-02-20 21:33:59 -05:00
deathride58
d167e68bd6 Merge pull request #8005 from Citadel-Station-13/kevinz000-patch-21 
Rare messages for combat mode: "Poses aggressively" and "asserts dominance with their pose"
 2019-02-20 20:19:02 -05:00
deathride58
e2ae4181f4 Merge pull request #7993 from MediHound/dogborg-upgrades-rework-v01 
Cyborg upgrades rework v01
 2019-02-20 19:19:20 -05:00
kevinz000
4c3f5ad65a 4.75% chance of posing aggressively and 0.25% chance of t-posing 2019-02-15 08:26:09 -08:00
kevinz000
079360beeb Update carbon.dm 2019-02-14 23:59:40 -08:00
kevinz000
7645317558 Revert "Adds realism to pleasure (#7986)" 
This reverts commit 2f2b089db1.
 2019-02-14 17:19:28 -08:00
deathride58
fe198c6717 Knockdowns will now force people to be dismounted from ridden vehicles (#7996) 
* knockdown() now causes people to be dismounted from ridden vehicles

* actually puts it in the right fuckin place
 2019-02-13 21:01:36 -08:00
deathride58
40d9dee654 gives combat mode examine text and a message on activation (#7995) 2019-02-13 21:01:12 -08:00
Poojawa
2f2b089db1 Adds realism to pleasure (#7986) 2019-02-13 20:45:16 -08:00
MediHound
f8f482bc69 Changes to Borg upgrades and modules 
Disabler Cooler now works for Security and K9, added Crew Pinpointer to Security and MediHound, added Crew Monitor to Medical.
 2019-02-11 16:51:36 +01:00
Ghom
0449325212 Fixes invisible limb sprites. (#7951) 
* F

* FF

* FFF
 2019-02-05 18:05:34 -08:00
deathride58
8e48dc5456 moves twilightic's donor item to the neck category in the loadout menu (#7937) 2019-01-27 00:31:29 -08:00
deathride58
a81474a786 Merge pull request #7964 from CydiaButt13/lampstuff 
Adds a Lamp Plushie
 2019-01-26 00:05:21 -05:00
Cydia
c860a797fd Adds a Lamp Plushie 
Little lamp plushie, click clack.
 2019-01-24 22:28:28 -06:00
Ghommie
4bd1af0915 purifies /datum from this filth. 2019-01-19 00:55:15 +01:00
Ghommie
6d51dff3eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit2 2019-01-19 00:28:24 +01:00
Ghommie
4cefeb9ce2 1 2019-01-18 06:54:48 +01:00
deathride58
c7a082d70d Merge pull request #7931 from Citadel-Station-13/souldeath_neck 
Donator Item - Soul Necklace
 2019-01-14 22:00:33 -05:00
deathride58
a877e796d4 Merge pull request #7890 from Ragolution/endrapen 
Suicide Messages, Combat Messages, Uniforms Recovered
 2019-01-14 21:39:02 -05:00
LetterJay
a99a7fb937 update 2019-01-13 23:38:30 -06:00
LetterJay
0015e806ab donation item 2019-01-13 02:36:15 -06:00
Ragolution
245b2c1968 Removed knot conditionals 
whatever
 2019-01-12 03:45:25 -05:00
Ragolution
1fd7bfe969 oh whoops 2019-01-12 02:50:03 -05:00
Ragolution
18d2572e57 Code Improvements (again) 
Knowing what I know now makes me wanna go revamp every instance of suicide code but geez.
 2019-01-12 02:31:25 -05:00
Ragolution
77a28abccf Code improvements 
Thanks to @Ghommie for the suggestion.
 2019-01-09 22:07:11 -05:00
kevinz000
4a50b86b47 Revert "[Ready] Makes synda paper mask correct eye sight and flash proof (#7858)" 
This reverts commit 2b68547f8d.
 2019-01-08 10:09:48 -08:00
Trilbyspaceclone
2b68547f8d [Ready] Makes synda paper mask correct eye sight and flash proof (#7858) 
* Wow this is worthless

* Better tells
 2019-01-08 02:41:12 -08:00
Trilbyspaceclone
889216c8f6 [Ready] New Mute quirk as well as Paper bin and crayon box to load-outs! - Requested by Suru (#7867) 
* Fixing updater

* Update negative.dm

* Update backpack.dm

* Update negative.dm

* Update negative.dm
 2019-01-08 02:38:54 -08:00
Ignari-Coldstorm
eb7f5634d5 Changes Jukebox Availability (#7905) 
Changes the massive price of the jukebox to something much more affordable, as well as broadens access needed to use it.
 2019-01-08 02:30:24 -08:00
nik707
f30f787ccf Merge pull request #7860 from deathride58/fixessyndiemasks 
fixes the syndicate mask
 2019-01-06 14:31:44 -06:00
LetterJay
87dee7ff83 mime overalls - donator 2019-01-05 11:01:21 -06:00
Ragolution
2ab86321c3 Conforms with changes requested by the BhjinBot 
Really cool bot I can't believe we have something so advanced for our codebase.
 2019-01-04 16:45:06 -05:00
Ragolution
b3a5b22578 TRAVIS LEAVE ME ALONE 2019-01-04 07:18:28 -05:00
Ragolution
2292b06ad1 Improved attack verbs on dildos+ suicide improvements 
Adds a bracket that kept the suicide message from appearing and grants each dildo its own attack message, mostly.
 2019-01-04 02:45:34 -05:00
Ragolution
6aed6d5612 Fixes all vg/5th port uniforms that aren't commented out for whatever reason. 
I'm pissy that this was so easy and nobody else bothered to do it.
 2019-01-04 01:55:33 -05:00