shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,776 Commits 5 Branches 0 Tags
737c8446c14a2feaa83e61aa7f732cb5d44b44d7
Commit Graph
623 Commits
Author SHA1 Message Date
PoojawaandGitHub 362b4b5a16 Fixes Poly (#2598) 2017-09-04 09:08:25 -05:00
PoojawaandGitHub 2c8e2f0679 New tails, new ears, new looks (#2585) 
* Sabresune markings and tail

also a few other fixes

* bluh

* kitsune tails and final tweaks

* enables taur on all other species, because why not
 2017-09-04 02:48:13 -05:00
PoojawaandGitHub 8767fa299b Fixes headpatting *wag and Vore spaceworthiness (#2582) 
* no you're not supposed to die in a gut

* Re added tailwagging when patted

* adjust sounds, adding belly noises mode

* lowers sounds.

* Adds Noisy belly mode
 2017-09-04 02:47:39 -05:00
CitadelStationBotandPoojawa ad43c951b8 [MIRROR] Slime people can eat anything again (#2568) 
* Slime people can eat anything again

* slimes can eat. Furry food prefs
 2017-09-04 02:41:15 -05:00
LetterJay 96c790a81f Unruntimes fdel on savefiles 2017-09-02 05:23:35 -05:00
LetterJayandGitHub b1302230c0 Merge pull request #2560 from Citadel-Station-13/upstream-merge-30121 
[MIRROR] Converts npc saves to jsons
 2017-09-02 05:20:31 -05:00
CitadelStationBot 9e90d582e5 Fixes dummy unequip runtimes. 2017-08-31 08:39:56 -05:00
CitadelStationBot c2a792d577 Converts npc saves to jsons 2017-08-30 08:01:36 -05:00
kevinz000 bd8a9dc435 Merge pull request #2528 2017-08-29 22:40:00 -07:00
kevinz000 b7e74bd3ab Merge pull request #2473 2017-08-29 22:27:39 -07:00
kevinz000 f9c0c6df3d update master 2017-08-29 20:46:38 -07:00
kevinz000 41c1f939ab gdi 2017-08-29 20:21:41 -07:00
kevinz000 92a2ac0ae3 soft sync 2017-08-29 20:20:11 -07:00
kevinz000 8d0c29f9da ok 2017-08-29 19:56:27 -07:00
LetterJay b2114a7b81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-08-29 21:19:22 -05:00
CitadelStationBotandkevinz000 2ff65a8e39 [MIRROR] Lowers the chance for monkeys to become gorillas (#2476) 
* Lowers the chance for monkeys to become gorillas

* Delete life.dm.rej

* Update life.dm
 2017-08-29 00:59:34 -07:00
LetterJayandGitHub 97bee315bf Update living_defense.dm 2017-08-29 01:50:46 -05:00
LetterJay 6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJay 7ea6eeb64e GUHRILLAZ 2017-08-28 10:23:11 -05:00
LetterJayandGitHub defab9c7fc Merge branch 'master' into upstream-merge-29923 2017-08-28 09:19:44 -05:00
LetterJayandGitHub 03a26e6468 Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5 
absolute pathing for mammals
 2017-08-28 08:56:55 -05:00
LetterJayandGitHub c043b8a1d5 Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182 
[MIRROR] Holoparasite prompts now have a "Never For This Round" option
 2017-08-28 08:46:19 -05:00
CitadelStationBot bab6b30e02 Splits jungle mob code into separate files 2017-08-28 02:20:39 -05:00
kevinz000andGitHub 5ebf1c4b6b Update furrypeople.dm 2017-08-27 19:48:29 -07:00
CitadelStationBotandkevinz000 349bd03b73 Adds periods to larva roars (#2512) 2017-08-27 06:42:16 -07:00
CitadelStationBotandkevinz000 94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
ktccdandkevinz000 985ea0d768 Sets all food prefs to NONE (#2517) 
People can RP their food likes/dislikes. This stuff, like deciding what
is/isn't edible to slimes and such is unasked for and unecessary.
Also, they didn't address that this stealth-nerfs non-humans as
donk-pockets and such food items were put in a lot of places, expecting
to be used for healing, but can now not be eaten by, for example,
lizards.
 2017-08-27 05:54:48 -07:00
kevinz000andGitHub 68f463452e Revert "Lets humans use MUTCOLORs [Maximum Heresy]" - turns out this is breaking things (#2516) 
fine ktccd il do it
 2017-08-27 04:21:29 -07:00
ktccdandkevinz000 e6114f7840 Makes humans use MUTCOLORS (#2513) 
Exactly what it sounds like. Enables humans to use mutant colours and
disables the preset skintones.
Preset skintones are still doable, since mutant colours can be
accurately adjusted by putting in RGB values for the colours, but it'd
be more manual work. On the other hand, you can now get a more accurate
skin tone...
 2017-08-27 00:58:50 -07:00
kevinz000andGitHub 3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
CitadelStationBot d38580afcd Holoparasite prompts now have a "Never For This Round" option 2017-08-26 11:07:20 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBotandkevinz000 d5dfe45c1e Dummies no longer queue, which humans probably shouldn't do ever (#2477) 2017-08-24 18:30:51 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJayandGitHub 2954e8ad16 Merge pull request #2455 from Citadel-Station-13/kevinz000-patch-4 
Makes beepsky stop bullying 2hus
 2017-08-22 02:29:13 -05:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
kevinz000andGitHub d56cc32cf0 Update human.dm 2017-08-21 21:43:17 -07:00
kevinz000andGitHub 4316a5a61b Update human.dm 2017-08-21 21:41:59 -07:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBotandkevinz000 b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBotandkevinz000 b72d304f1c [MIRROR] Fixes the amounts for examining disgusted people (#2253) 
* Fixes the amounts for examining disgusted people

* Update examine.dm

* Delete examine.dm.rej
 2017-08-21 20:24:29 -07:00
CitadelStationBotandkevinz000 4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBotandkevinz000 999c921f63 Removes the chat message from *spin (#2428) 2017-08-21 19:54:24 -07:00
LetterJayandGitHub f2f1474123 Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747 
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
 2017-08-21 20:32:10 -05:00
Poojawaandkevinz000 91fc414b20 Changes Ghost role ping sound effects (#2441) 
* change that fucking blare

* Update xenobiology.dm
 2017-08-21 17:05:09 -07:00
ktccdandkevinz000 987c0c35da Makes Taurs not render human legs (#2448) 
Since taurs use their own sprite legs instead, we'll rely on those.
This'll fix some fringe cases with nagas and the problem with driders
completely covering their front drider legs.
This will introduce some weirdness with cutting off limbs, since taur
sprites have NO support for this, but I would need to completely
refactor how we handle taurs to split up their sprites like that... And
I'm not THAT good.
 2017-08-21 17:03:29 -07:00
CitadelStationBot 41b0f9f9d4 Gorillas 2017-08-20 19:56:21 -05:00
LetterJayandGitHub ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00