Commit Graph
977 Commits
Author SHA1 Message Date
DahlularandGitHub 6d3cac3ce5 Merge pull request #315 from Jay-Sparrow/Synthlegs
Synths
2020-07-13 00:14:18 -06:00
JaySparrow ff689c1b12 Mammals
Fucking sprites. Fuuuuuckin sprites. Fuuuuuck.
2020-07-12 18:53:26 -05:00
JaySparrow d22532585d Synths
Fuckin no brim robot assholes fuckin wrecking the code fuck.
2020-07-12 15:24:26 -05:00
DahlularandGitHub f68de7f168 Merge pull request #314 from Dahlular/radiance
Adds some lore stuff and creates a base for the next protagonist role
2020-07-11 22:15:35 -06:00
DahlularandGitHub 53d915a419 Merge pull request #313 from Jay-Sparrow/leash
Leash patch
2020-07-11 22:10:45 -06:00
Dahlular 6db7f2a48f missed a spot 2020-07-11 22:08:27 -06:00
Dahlular dd4c411e31 adds books to each map
skrrt skrrt
2020-07-11 22:06:56 -06:00
Dahlular 58a667e35f lorebook 1 2020-07-11 21:24:33 -06:00
JaySparrow 50ab355f81 Leash patch
Prevents someone from being leashed twice. There will be no more pet fueled singularities.
2020-07-11 18:52:18 -05:00
Dahlular 95b1e0b94b Merge remote-tracking branch 'upstream/master' into radiance 2020-07-11 16:37:53 -06:00
DahlularandGitHub d73ddaf94a Merge pull request #312 from Kabramen/owo
owo what is this???
2020-07-11 16:20:35 -06:00
Kabra_men 53aa5fb5e6 owo what is this??? 2020-07-11 11:36:59 -03:00
DahlularandGitHub db69551756 Merge pull request #311 from Dahlular/sizecodefixes
Sizecode fixes
2020-07-11 01:16:00 -06:00
Dahlular 33f69de6a0 Further fixes 2020-07-11 01:09:03 -06:00
Dahlular 43ed6b41f9 fixes stepping under interactions and allows more size pref sizes
unga dunga
2020-07-10 23:50:10 -06:00
DahlularandGitHub ac17603201 Merge pull request #309 from Kabramen/poly-bikini
New polychromic outfits + loadout changes
2020-07-10 21:20:04 -06:00
DahlularandGitHub 879e089539 Merge pull request #308 from MalricB/depression
Ports Malric plushie
2020-07-10 21:00:02 -06:00
Kabra_men 8619755855 panties to the kinkymate 2020-07-10 03:48:53 -03:00
Kabra_men 4fc0b3c23f New polychromic outfits + loadout changes 2020-07-10 02:55:48 -03:00
CygnusB dac9ba1246 ports malric plushie
hell yes
2020-07-10 02:46:05 -03:00
DahlularandGitHub ceb52a5bb7 Merge pull request #307 from ToonClyde/Pubbypipes
Pubby Pipe fix
2020-07-09 21:29:19 -06:00
QuoteFoxandGitHub 59fbeae9d4 Merge pull request #306 from Jay-Sparrow/No-clone
DNC Fix
2020-07-10 01:00:11 +01:00
Dahlular 528a184f55 im tired and forgot to do work 2020-07-09 14:48:39 -06:00
ToonClyde b7906c9b2e Pubby Pipe fix 2020-07-09 12:28:00 -07:00
JaySparrow 49ac30a0b4 DNC weirdness
Do not clone made all sorts of weird stuff happen by accidentally sharing an ID with a changling trait. DNC users should now be able to be debrained, and have blood again. Sorry!
2020-07-09 13:30:04 -05:00
DahlularandGitHub 6fc3759c95 Merge pull request #304 from Oposshim/goldenplaque
Goldenplaque
2020-07-09 02:51:29 -06:00
DahlularandGitHub 4e38afec0f Merge pull request #305 from ToonClyde/newmap
Update CentCom Lobby
2020-07-09 02:47:56 -06:00
ToonClyde d1a51c00a3 Update CentCom.dmm 2020-07-09 00:59:36 -07:00
Oposshim 82d190b276 another poss to kin lore pull
nuff said
2020-07-09 03:01:26 -04:00
Oposshim 6fa390975d Merge remote-tracking branch 'upstream/master' into call-it-whatever-the-fuck-i-want 2020-07-09 02:54:49 -04:00
Oposshim 0716161cd3 another poss 2 kinaris lore push
golden plaque + Kin.Co UI revamp
2020-07-09 02:42:40 -04:00
Oposshim 5c588998bc yet another poss to kinaris push
a golden sign in Valarie's name
2020-07-09 02:15:07 -04:00
DahlularandGitHub 76468446a4 Merge pull request #302 from Dahlular/pubby
Updates PubbyStation for Map Usage (And adds a neat Kinaris sign!)
2020-07-08 07:02:47 -06:00
Dahlular d3a4402fb2 Merge branch 'master' into pubby 2020-07-08 07:01:36 -06:00
Dahlular 6b7bfd707e Conflicts. 2020-07-08 06:58:11 -06:00
Dahlular fb74e0c742 Update decals.dmi 2020-07-08 06:37:54 -06:00
DahlularandGitHub f5fd66c41c Merge pull request #299 from Kabramen/Lavaland-ruins
Oasis ruins
2020-07-08 06:17:29 -06:00
DahlularandGitHub c799fc56e4 Merge pull request #301 from Chemlight/MutationToxinAddition
Additional species mutations w/ green extracts
2020-07-08 06:14:15 -06:00
Dahlular 29774be859 Updates PubbyStation for Map Usage (And adds a neat Kinaris sign!) 2020-07-08 06:12:51 -06:00
Chemlight 82d6695faf MutationToxinAdditionFix
Changed species/moth to species/insect
2020-07-08 02:30:54 -07:00
DahlularandJaySparrow 6e56fe117d shit 2020-07-07 23:58:25 -05:00
DahlularandJaySparrow 013700153f thank you digitigrade legs, very cool 2020-07-07 23:58:24 -05:00
DahlularandJaySparrow 5b7e47db45 small fixes 2020-07-07 23:58:23 -05:00
DahlularandJaySparrow 18588e6f99 funny synth port part 1 which may or may not have broken a lot 2020-07-07 23:58:21 -05:00
Chemlight f0f54ba80e Additional species mutations w/ green extracts
Provides additional effects to the current green extract when injected with different chemicals. This is to provide ways back to one's original species since for a while Lizardpeople were the only ones who had this luxury along with humans, while slimes just got bonuses.

Sulfur > Mammal
Oxygen > Avian
Water > Aquatic
Sulphuric Acid > Xeno Hybrid
Ammonia > Moth
Crocin > Felinid
Oil > IPC
2020-07-07 21:13:16 -07:00
DahlularandGitHub 0f680c03c6 Merge pull request #300 from Jay-Sparrow/No-clone
Do Not Clone
2020-07-07 21:39:13 -06:00
JaySparrow 3c572f0d6e Do Not Clone
Adds a new trait for people who don't want to be cloned. Gives the medical bay something to do at least.

Also, moves a define to it's appropriate folder to prevent any potential future problems because for some reason it does matter where those defines are for certain procs. The new trait is in negative.dm instead of the hyper traits file, because it populates the list in that order and not based on cost.
2020-07-07 19:49:04 -05:00
QuoteFox 62c3aa6b17 cringe
cringe
2020-07-05 21:19:26 +01:00
QuoteFox 89269608f0 fix to cloning
another fix...
2020-07-05 20:40:36 +01:00
QuoteFox fdb36f8399 Fix to cloning
Fix to cloning
2020-07-05 20:38:59 +01:00