Commit Graph
247 Commits
Author SHA1 Message Date
BlackMajorandArchie 02cb328921 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2021-01-05 16:58:19 -03:00
Putnam3145andArchie 0db5aed986 Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
LinandArchie b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
QuoteFoxandGitHub 4d164c0b5b Merge pull request #813 from ArchieBeepBoop/thalpyyyyy
Updates our Fermichems, fixes synthtissue.
2021-01-04 05:41:29 +00:00
kevinz000andArchie ca55e5f8b0 Merge pull request #9804 from Ghommie/Ghommie-cit351
Unmodularize keybindings.
2021-01-04 01:31:17 -03:00
Archie 97fc5821d7 Synthtissue fix (Thanks to Fermi! <3) 2021-01-03 16:54:22 -03:00
Archie 622a6232b0 Chem master analyze fix, synthtissue update 2021-01-03 07:15:51 -03:00
kevinz000andArchie 12c8ebea11 Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. 2021-01-03 05:21:47 -03:00
nik707andArchie c818041572 Stops infinite clones 2021-01-03 05:06:41 -03:00
kevinz000andArchie ee082f200e Fermi1 2021-01-03 05:00:57 -03:00
QuoteFoxandGitHub b6d264ec5b Merge pull request #803 from ArchieBeepBoop/tablechem
Introducing... Tablesmitium.
2021-01-03 05:46:34 +00:00
Kabra_men 1c54fd3c91 More loadout stuff - now with Roman flavor! 2021-01-02 20:07:15 -03:00
QuoteFox 49f39f27db Fix
just fucking work, ive had no sleep. My wife took the kids.
2021-01-02 16:40:06 +00:00
QuoteFoxandGitHub 092a7fa5a1 Merge pull request #804 from quotefox/sexhud
New HTML arousal hud, with contextal options, plus new lewd features.
2021-01-02 14:34:31 +00:00
QuoteFoxandGitHub a9575ffc21 Merge pull request #794 from lyricalpaws/master
Let synthliz and IPC have and be infected by nanites
2021-01-02 14:02:24 +00:00
QuoteFox 333f410476 New Arousal Hud
New Arousal Hud, much more user accessable with contextal options.
2021-01-02 13:39:17 +00:00
Archie ad7a46347c Introducing... Tablesmitium. 2021-01-01 19:23:49 -03:00
QuoteFox 1d4023f0d9 heat changes!
heat changes!
2021-01-01 01:59:02 +00:00
Chloe Carver-Brown c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
QuoteFoxandGitHub d940287569 Merge pull request #777 from ArchieBeepBoop/drakeborg
Removes Drakeborgs
2020-12-27 08:59:00 +00:00
siliconsandArchie 16cc9e35f7 Removes Drakeborgs 2020-12-27 05:55:38 -03:00
QuoteFoxandGitHub aa58dec5f4 Merge pull request #771 from ArchieBeepBoop/blood2
Pooj Blood Code Cleanup
2020-12-27 07:10:40 +00:00
QuoteFox 48076fbfd3 patreon rewards
natak, demoncat
2020-12-26 19:11:03 +00:00
GhomandArchie 0c8ed89992 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-12-25 17:30:06 -03:00
QuoteFox 1c59433c89 can now climax on clothed partners
can now climax on clothed partners
2020-12-25 02:19:38 +00:00
QuoteFox 36deebe5b8 clean fix
clean fix for cum
2020-12-24 19:24:32 +00:00
QuoteFox e9cb38d2cb fix
fix
2020-12-24 19:12:01 +00:00
QuoteFox f9d7b255b1 Cum over partner option
Cum over partner option
2020-12-24 19:10:47 +00:00
Archie b2a1a63bb1 Reagent Fix Pack 1 2020-12-24 14:30:43 -03:00
QuoteFoxandGitHub 7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
LinandArchie b9fe810525 Merge pull request #9959 from Ghommie/Ghommie-cit397
patching some combat mode edge cases and issues.
2020-12-20 11:32:28 -03:00
Archie 48ede22c46 Merge remote-tracking branch 'upstream/master' into reagentsagain 2020-12-18 01:20:57 -03:00
Archie c4b2debc59 Luweth's Donator Item 2020-12-09 22:53:58 -03:00
LinandArchie a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Vladin AmporaandGitHub 473a130c08 wait a fucking second
This ain't a fucking clip on LOOK AT IT MY MAN LOOK AT IT
2020-11-21 00:08:39 -05:00
Vladin 077686c11c Crew can come to work looking professional
not that any of our players act that way
2020-11-20 18:57:19 -05:00
Dip 42d33e2b78 Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into sprayfixes 2020-11-10 11:51:19 -03:00
QuoteFox e56b7226c5 Revert "new size"
This reverts commit 640786d203.
2020-11-09 21:29:00 +00:00
QuoteFox 640786d203 new size
new size
2020-11-09 21:21:44 +00:00
QuoteFox 1e3b069017 New erect penis sprites.
New erect penis sprites.
2020-11-09 20:45:29 +00:00
kevinz000andDip f138e5cf53 Fixing Hypospray
Unmodularize MkII hyposprays and other reagent items sprites.
2020-11-09 16:45:17 -03:00
Dip cde46675f3 Fix examine 2020-11-09 16:15:14 -03:00
kevinz000andDip 3a84791e6c Merge pull request #9380 from Ghommie/Ghommie_cit212
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2020-11-03 01:32:15 -03:00
Dip 859dfd24f5 synthliz bloodtype 2020-10-31 00:23:24 -03:00
Dip 9acf8ffd40 merge conflict drinks.dmi 2020-10-29 13:50:19 -03:00
kevinz000andDip 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
kevinz000andDip 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
ToonClyde 4207015199 CitRP Fluffy Jackets 2020-10-26 14:30:59 -07:00
Kabra_men fd44d1a9fd Fix PR #584 and some additions for lockers and kink vendor 2020-10-23 23:19:34 -03:00
DahlularandGitHub 79f6e56852 Revert "Additional loadout polychromatic gear" 2020-10-23 16:40:02 -06:00