Commit Graph

876 Commits

Author SHA1 Message Date
Fermi
91f10442cf Merge branch 'pr/12' 2019-05-26 02:05:48 +01:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
2019-05-25 11:30:57 -07:00
kevinz000
deffcb3226 Merge pull request #8398 from BurgerLUA/AntiAssSlap
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
2019-05-25 11:28:39 -07:00
Fermi
faf6585b69 Winding down to the final commits. 2019-05-25 01:04:00 +01:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
Fermi
a480ccb9fa Changes 2019-05-23 05:26:38 +01:00
Fermi
41d991e81c Pre blood commit 2019-05-22 18:13:12 +01:00
kevinz000
bcf78736ba Merge pull request #8385 from BlackMajor/Dunga
Adds a cream pie smite.
2019-05-20 23:32:27 -07:00
BurgerLua
bcf563e132 Fixes ass slapping to be less annoying. 2019-05-20 21:53:47 -07:00
Fermi
a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
kevinz000
626ede8464 Merge pull request #8367 from Poojawa/genital-improvements
[READY] Genital fixes and skintone sync [Adds erections[]
2019-05-19 22:47:01 -07:00
kevinz000
6c79587dad Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here!
Butt Slaps
2019-05-19 22:43:40 -07:00
BlackMajor
00356ce980 Cream pie smite 2019-05-18 17:09:26 +12:00
Nero1024
2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
Poojawa
b95bc24def mission accomplished 2019-05-17 04:24:23 -05:00
deathride58
cbac4b1daf Merge pull request #8330 from Scorpion-117/master
This is an entire addition to put stargazers back into clock cult.
2019-05-17 00:13:35 -04:00
Sishen
ac04e23e31 Nympho Traiting & Arousal!
Butt slaps 2.0
Added nympho to defined traits, added arousal damage to ass slapping (arousal system needs to be enabled), and added forced orgasms to nymphos at max arousal
2019-05-16 10:17:16 -04:00
CalamaBanana
7cd74e6601 Adds pink to the circuit coloring tool 2019-05-15 00:07:53 +02:00
deathride58
06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
Fermi
ec2f33ceb5 Added Hatmium and a few slight fixes. 2019-05-12 03:42:23 +01:00
Fermi
ddad7a173d All compiling errors fixed!! I did it!! 2019-05-11 15:47:58 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Thalpy
926bd65392 Merge branch 'master' into FermiChem 2019-05-11 14:14:20 +01:00
Fermi
ac8b7be45c Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA) 2019-05-10 03:10:42 +01:00
Thalpy
5287f3f9c7 Merge branch 'master' into pr/7 2019-05-10 02:20:19 +01:00
Scorpion-117
6e3722fede increased costs of power
with stargazers coming back I need  to jack up these values in order to compensate for the severe buff
2019-05-08 07:49:07 -06:00
deathride58
aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
2019-05-06 21:23:55 -04:00
Fermi
f31a46e029 Fixed a few things, 1/2 way through MC chem. 2019-05-05 20:32:07 +01:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
kevinz000
534b5f0287 Merge pull request #8309 from Trilbyspaceclone/Food-5
Better sushi crafting, and tuna based food - Works addtion
2019-04-30 05:42:30 -07:00
Trilbyspaceclone
25df517ad5 Update construction.dm 2019-04-29 17:48:26 -04:00
BurgerLua
1f78520b68 Adds a new trait that makes you immune from the "positive" effects of hexacrocin and crocin. 2019-04-24 20:13:21 -07:00
kevinz000
a5e750e20f skintone 2019-04-23 19:06:00 -07:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa
6a26220fea Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into muzzled-masks 2019-04-06 02:27:58 -05:00
deathride58
6259210a33 Merge pull request #8198 from Poojawa/Randomize-tweaks
Species Spawn tweaks and tauric plasmaman suit icons
2019-04-05 20:11:59 -04:00
Poojawa
e3047cb69e fixes messy random spawn code
Humans return to having tail_human and ears. there's a reason these are seperated out. reee.
2019-04-02 02:29:37 -05:00
deathride58
c8d51c4231 Attempts to improve the performance of /mob/Stat() by using defines instead of procs for grabbing the current time 2019-04-02 01:11:29 -04:00
Poojawa
b11e3bbc96 Vore mode button and feeding 2019-03-25 04:19:00 -05:00
Poojawa
df0aa7cadb missing ) in macro call 2019-03-22 17:16:38 -05:00
Poojawa
ae02f091ff Dragon fixes, UI fixes 2019-03-22 15:06:36 -05:00
Poojawa
fb1b76cafe compiles but I don't feel like spriting atm 2019-03-18 02:00:00 -05:00
Fermi
4558110dfb aaaa what did I doooo
Github pains me greatly
2019-03-11 18:21:09 +00:00
kevinz000
821a31afb8 Merge pull request #8090 from deathride58/tgpushes
Replaces disarm right click action with tgstation/tgstation#42958's disarm pushes
2019-03-10 13:51:44 -07:00
Amatsu Darkfyre
54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. 2019-03-08 17:22:40 -05:00
deathride58
d8f738184b Replaces disarm right click action with tgstation/tgstation#42958 's disarm action, also ports the removal of non-help intent pushing from that same pr 2019-03-04 21:05:50 -05: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
Trilbyspaceclone
f9d5c6eec9 [Ready]Adds 2 new quirks! Quick step and Light Sensitivity (#7933)
* Fixing updater

* Adds the quirk

* Lilly dosnt know how to code this stuff 

Watch it brake everything and cry 101

* IDK what im doing

This will likely be speggie code

* correct names are a thing

* Adds light sensitivity

* Adds the debuff

* mite need to ask for helps

* Not used somehow

* Laughs in failer

* H -> h

* Update species.dm

* Speed

* Update species.dm

* Apply suggestions from code review - Ghommie

He got me

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species.dm

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Rag the grate

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Update negative.dm
2019-02-22 06:11:16 -08:00
deathride58
2a07a5044f expands shuttle transit borders from 8 to 10 to ensure that you don't see normal space or other transit areas while in a shuttle (#8031) 2019-02-22 06:08:23 -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