Commit Graph

112 Commits

Author SHA1 Message Date
Poojawa
2bb09bef5f Adds additional screen 'faces', allows switching of screens in game
also puts jelly people in with the jelly people file.
2018-03-20 13:53:52 -05:00
Poojawa
af82e1109f slight tweaks, revert job controller changes, penor layering tweaked 2018-03-20 10:41:36 -05:00
Poojawa
d593e46c6b working as intended now and improved 2018-03-19 07:00:05 -05:00
Poojawa
b27c5cd3b0 Revert "SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress."
This reverts commit a2fbab5ccb.
2018-03-19 05:32:12 -05:00
Poojawa
a2fbab5ccb SCREEE. fuck this. I'mma just revert at this point, but don't want to lose progress. 2018-03-19 04:57:57 -05:00
Poojawa
d387481aa5 UI's functional again at least 2018-03-19 02:13:47 -05:00
Poojawa
b6c780df30 reee
removes the empty catagory entry on gear loadout
2018-03-19 01:02:04 -05:00
Poojawa
4db062c9c0 didn't fix anything, reee. but I have an idea 2018-03-18 20:20:20 -05:00
Poojawa
8304a40969 probably fixes bad loadout tab things 2018-03-18 11:34:57 -05:00
Poojawa
acfee53a98 :HELP: MAINT 2018-03-18 11:26:00 -05:00
Poojawa
796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED
That feel when you're in the 'Oh, well while I'm here...' mindset.
2018-03-18 09:02:13 -05:00
deathride58
063abf2a5d Makes xenobio consoles upgradeable via disks obtainable from bluespace research, makes most xenobio console abilities exclusive to disk upgrades (#5953)
* Makes xenobiology consoles rely on upgrades, spreads out xenobio console abilities into upgrade disks

* Update xenobio_camera.dm
2018-03-16 10:13:06 -07:00
deathride58
8923bb9488 Small combat balancing: Small crawling nerf, Esword buff (#5937)
* adds a delay and message to crawling underneath people

* makes eswords take less stamloss to swing around, lays down groundwork for later parts of combat reworks

* FUCK
2018-03-16 03:27:30 -07:00
Zna12
c2e95fc233 Oh that blob (#5934)
Removed minimum player count for the blobs.
2018-03-16 03:21:34 -07:00
Poojawa
31d988344a maybe actually have mentors that aren't broke as shit (#5954) 2018-03-15 20:49:32 -05:00
deathride58
035b3458de MDB fix attempt number two. (#5928)
* HOPEFULLY fixes mapdiffbot

* attempt number 2
2018-03-14 17:08:19 -05:00
Zna12
cc6bab0c06 Foam Lasertag Darts (#5847)
* Laser Tag Darts.

Darts that are compatable with the laser tag system

* Lastag Ammo Boxes. Autoylathe Update.

* Final bug fixes.
2018-03-13 18:39:19 -05:00
deathride58
1c0b13ecfb [READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)
* part 1 - resist out of resting, move and interact with the world while resting, and stamina regen nerf

* makes beepsky check for stuns instead of knockdowns, adds message for getting up, makes gravity reduce standup time, and more

* sprinting, staminacrit, balance changes, and more

* adds stamina modifier to clickdelay, makes items deal stamina damage to the user when attacking, buffs resting stamina regen

* combat mode, ability to toggle right-click context menu on/off, basic combat mode QOL, lays groundwork for 2-handing any item

combat mode toggle sound is from Interbay.

* commits dme changes

* unarmed combat stamina, ability to right click in combat mode, balance changes

* tosses in the HUD icons for later-ish

* rolls back admin.txt

* lotsa UI stuff

* stamina checks, some balance stuff

* adds support for best ui, adds right click to flush disposals, removes aggressive grab pinning in favor of neckgrab chokeholding

* quick dogborg patch while i figure out what do do with them

* oops - fixes prefbreaking for screenshake

* trying to sprint from an elevated surface onto lower ground will now knock you down

* right click to pull fire alarm, lets you bully people by pulling chairs out form under them, makes attacking objects cost stamina

* makes accidents during slipping less likely to occur while combat mode is active, makes tripping off elevated surfaces cause accidents

* makes pumping shotguns cost a tiiiny bit of stamina

* makes eyestabbing and batoning cost stamina

* makes failing stamina checks error out properly, adds stamina check to shotgun pumping

* adds stamina check for chair pulling

* readds aggressive grab pinning

* fixes bug with being buckled preventing interaction

* adds recoveringstam check to incapacitated

* reduces stamina cost for attacking

* oh this too

* fixes bug where you can get stuck in recoveringstam if your stamina suddenly becomes 0 while you're in staminacrit

* makes monkey transformation inherit staminaloss

* adds the ability to wave or shake your fist at someone via right click

* grammar and span closing

* 99 annoying little bugs on the wall, 99 annoying little bugs. take one down, pass it around, 864 gamebreaking bugs on the wall

* more distant right-click emotes.

* buffs standing stamina regen a tiiiiiiny bit

* adds aiming down sights for guns, makes firing guns cause trace amounts of staminaloss

* crusher powercreep - gives crushers the ability to heal staminaloss

* item throwing buff

* adds 1:1 HUD layout

* hopefully fixes issue with recoveringstamcrit not updating

* giant hipfire nerf

* halves the effect of staminaloss on movement speed

* makes stamina recover faster in staminacrit, makes it easier to get disarmed out of combat mode

* get_weight(), movedelay health_deficiency tweaking, combat and resting checks for item attacking

* makes staminacrit automatically disable combat mode, it's now impossible to enter combat mode while in stamcrit

* adds stamina buffer, halves the time needed to stand up after resting, increases stam penalty for firing weapons, and more

* tweaks stamina buffer drain rate a little

* makes buffered staminaloss redirect stamina to the actual stamloss proc when empty, makes stamina buffer stat() more precise

* removes stamina modifier for clickdelays, makes stunbatons deal extra staminaloss

* makes electrodes deal a lil extra staminaloss

* drones cannot resist a rest, so now only carbons are forced to rest

* restricts aiming down sights to carbon mobs, adds stamina display to stat()

* makes gun accuracy and stamcosts more flexible, decreases base inaccuracy penalty, makes borgs immune to inaccuracy penalties

* nerfs inaccuracy penalties just a lil more, fixes blooddrunk miner eye depleting all your stamina

* getting used to tortoisegit

* readds temp dogborg buff

* stamina and stamina buffer HUD displays. Stamina sprite from hippiestation

* makes afterattack call properly again

* decreases stamina buffer regen time to 3 seconds

* Yknow what? decreases it to 2 seconds. That's 3 entire attacks worth of waiting

* makes stamina buffer influence movespeed a lil

* nerfs compiling errors

* tweaks the icons a little

* adds autostanding, adds delimiters to attempts to stand

* makes automatic standup attempts a little clearer

* rest button now toggles intent to rest, fixes perma rest

* oop - quick fixes

* Makes crushers ignore recoil stamina on lavaland, makes burstfiring weapons deal less staminaloss

* buffs highlander sword

* makes stamina have less of an impact on the health display

* fixes dogborgs shoving other borgs into infinite stuns

* You can no longer shoot over tables or shoot through windows while resting. Also buffs turrets
2018-03-11 13:32:44 -07:00
LetterJay
b4f5279580 Update __donator.dm 2018-03-11 14:17:47 -05:00
LetterJay
1e7c6daeaf Update custom_items.dm 2018-03-11 14:17:18 -05:00
LetterJay
3266d18493 Update __donator.dm 2018-03-11 13:34:25 -05:00
LetterJay
1f3c9fca30 adds two donator items 2018-03-11 07:22:46 -05:00
deathride58
45b473f14d Merge pull request #5843 from Poojawa/trek-outfits
Trek outfits
2018-03-09 18:46:11 +00:00
deathride58
5743ce2222 Merge pull request #5830 from Zna12/Biodegradable-Darts
Degradable Darts, Citadel Style
2018-03-09 18:43:35 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
Zna12
0941433022 Merge branch 'master' into Filet-o-fish 2018-03-07 10:41:09 -06:00
Poojawa
f3ab2c57d4 yey, working and in the loadout, though it fucks with the formatting 2018-03-07 02:44:50 -06:00
Poojawa
57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Zna12
09c840d291 Woops.
I wasn't paying enough attention, but it added a feature I wasn't intending. This smooths out the feature.
2018-03-06 22:42:02 -06:00
Zna12
1fc03bb392 Merge branch 'master' into Biodegradable-Darts 2018-03-06 21:57:23 -06:00
Zna12
05159e8029 Degradable Darts, Citadel Style
Just incase upstream doesn't want my memes.
2018-03-06 21:54:15 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
Poojawa
e07efc29fb stuffs 2018-03-06 20:10:14 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
Poojawa
6e5131cfc5 Vore code to json and more (#5789)
* Vore 2.0

Initial commit

* double checked porting

* Fixes compile issues

* converts Ash Drake bellies to new system

digs out lingering datum/belly stuff too

* Let's just work on this later

* System operational

* Update preferences.dm
2018-03-06 03:59:31 -06:00
Zna12
954ba91c07 Fucking furries reeeeeeeeeeeeeeeeee 2018-03-05 17:03:33 -06:00
Zna12
d7f3942129 Revert "Modularize modularize modularize"
This reverts commit 8a86cbd307.
2018-03-05 16:55:00 -06:00
Zna12
8a86cbd307 Modularize modularize modularize
Quaaaaaaaaack.
2018-03-05 16:52:25 -06:00
Cameron!
841a4199af Removes MediHound's Noncon Vore (#5738)
* Removes MediHound's Noncon Vore

MediHound once again respects vore preferences, as intended.

To make up for this, they now receive a unique cyborg hypospray with fewer reagents, increased energy costs, and no ability to upgrade.

* Moves Preference Check to New Sleeper-Specific Variable, Buffs Hypo

Rather than using target.devourable, MediHounds now check for a new target.sleeperable preference, which defaults to TRUE.

Also, removed the custom HoundHypo. MediHounds will now get the full borg hypospray.

* Removes unnecessary 5th port code

* Breaks the patch for Bhijn's viewing pleasure

DNM etc

* Still not fixed

* Fixes it again.

MediHound sleeper preference is now a game preference toggle, rather than a vore panel toggle.

MediHounds will not be able to ingest SSD or catatonic players.
2018-03-05 12:33:23 -06:00
Zna12
a28763a6e6 Filet-O-Adisa 2018-03-05 06:51:48 -06:00
Michiyamenotehifunana
0c0c0a5485 toys and stuff (#5772) 2018-03-04 13:07:42 -06:00
Zna12
c3c5f86971 Tacticool sensors (#5740)
* Tacticool Sensors

Tacticool Turtlenecks now have sensors, for those memes that want to wear them on station.

* Atom is screwing with me.

Fixed a rogue indent

* I had this part ignored. Woops.

* Code cleanup 101.

Apparently I didn't need the rest of this.

* Ree

Stupid admin.txt
2018-03-04 11:54:25 -06:00
Zna12
71aa99b197 What blob (#5771)
* What blob?

100% Spaghetti Code

* Silly mistakes made by silly people
2018-03-04 11:54:09 -06:00
Poojawa
61b121a4c9 Dogborg fixes, Borg construction animations! (#5725)
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
2018-03-04 11:53:48 -06:00
Michiyamenotehifunana
091fedc72b Adds Pump-Action Particle Blasters! (#5696)
* Adds pump action disablers and more!

* Fixes things, implements in a better way
2018-03-02 20:08:35 -06:00
Michiyamenotehifunana
9c87deac06 New sprites and inhands for eguns and lasers! (#5741) 2018-03-02 18:32:32 -06:00
LetterJay
36b3e13c8c Merge pull request #5697 from Michiyamenotehifunana/Great-Trigonometric-Sprite-Replacement
The Great Trigonometric Sprite Replacement, Phase 1!
2018-02-28 23:53:29 -06:00
Michiyamenotehifunana
70be9f3027 Reverts particle blasters, modifies sprites 2018-02-26 22:41:47 +08:00
Michiyamenotehifunana
b858e54d03 The Great Trigonometric Sprite Replacement, Phase 1! 2018-02-25 20:10:39 +08:00
kevinz000
5971347949 Nerfhammer 2.0 2018-02-24 14:01:02 -08:00