517 Commits
Author SHA1 Message Date
QuoteFoxandGitHub 970d4e20fc Merge pull request #802 from DragonTrance/syndie-cryo
Lavaland Syndicate Cryo Pod
2021-01-02 13:40:26 +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
DragonTrance 0fa9b23db7 runtime squash 2021-01-01 12:22:29 -07:00
DragonTrance 76b04095ee adds cryopods in syndicate base 2021-01-01 12:19:53 -07:00
QuoteFoxandGitHub aa2280113d Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes
Expander + VTEC upgrades Fix (times two)
2021-01-01 02:26:01 +00: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
Tename 769721300f boggers 2020-12-29 22:12:38 -08:00
DragonTrance 7753acc547 forgot one thing 2020-12-29 11:27:53 -07:00
DragonTrance d6c6c80578 rahh 2020-12-29 11:23:08 -07:00
DragonTrance 529824b320 borg expander + vtec upgrades fix 2020-12-29 11:15:19 -07: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
DahlularandGitHub 4fb6256a99 Revert "Borg expander + VTEC fix" 2020-12-06 13:44:28 -07:00
DahlularandGitHub 40b1495ff3 Merge pull request #714 from DragonTrance/borgupgrade-fix
Borg expander + VTEC fix
2020-12-06 13:22:11 -07:00
DragonTranceandGitHub f976eee3df 6 (?) 2020-11-22 14:39:12 -07:00
DahlularandGitHub fac672878c Merge pull request #703 from VladinXXV/style-really-matters
Adds the REAL black suit and an unobtainable tie to the loadout.
2020-11-21 23:02:01 -07: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
kevinz000andDip c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03: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
DahlularandGitHub e73bc36749 Merge pull request #584 from BHyran/Kromatose
Additional loadout polychromatic gear
2020-10-23 16:29:37 -06:00
DahlularandGitHub 0719169693 Merge pull request #603 from ArchieBeepBoop/gibspawner
Mass Merge - The Blood System Rework & A metric fuckton of runtime fixes
2020-10-23 16:20:26 -06:00