Commit Graph

272 Commits

Author SHA1 Message Date
deathride58 9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00:00
LetterJay 15109ad50a Merge pull request #6029 from Citadel-Station-13/LetterJay-shockcollar
Fixes autolathes not building shockcollars
2018-03-20 10:10:36 -05:00
LetterJay 089c2e70b2 fixes runtime in donator
fixes runtime in donator
2018-03-20 09:34:22 -05:00
LetterJay e01a0d521d Update shockcollar.dm 2018-03-19 23:44:13 -05:00
Poojawa 8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
Poojawa 088f3fda5d Gives a prompt for people to see who is replying to an mhelp (#5963) 2018-03-19 21:27:41 -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
LetterJay 4f07c9f856 Merge pull request #5995 from Citadel-Station-13/donator
sabre and sheath
2018-03-18 22:03:11 -05:00
Poojawa 4db062c9c0 didn't fix anything, reee. but I have an idea 2018-03-18 20:20:20 -05:00
LetterJay 9e072fe328 Update __donator.dm 2018-03-18 19:28:51 -05:00
LetterJay 46733bca65 type path 2018-03-18 16:54:43 -05:00
LetterJay e163a889fb i hate this shit 2018-03-18 15:53:20 -05:00
LetterJay 18759e03b3 op 2018-03-18 15:47:48 -05:00
LetterJay 380ec76618 sabre and sheath 2018-03-18 12:18:08 -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
Poojawa d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
Poojawa d3407f1711 a few other little runtimes 2018-03-17 20:03:21 -05:00
Poojawa c8365e6be7 Hunts down some runtimes
cleans up some dogborg sleeper code too
2018-03-17 19:38:03 -05:00
deathride58 542208445b Merge pull request #5901 from NopeMcHaltman/cit_mood
Some minor mood additions
2018-03-17 23:56:50 +00: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
Anonymous 95d9ff2328 Merge branch 'master' into cit_mood
Handled Conflict with tgstation.dme
2018-03-16 17:09:57 +03:00
Michiyamenotehifunana b479e5fc7a [Ready for Review] Revamps Wish Granters (#5773)
* Rebalances Wishgranters

* Removes accidental copypasta

* Revamps Wish Granters entirely!

* Finishes Wishgranter revamp, rebalances eutactic blades

* Adds more bonuses to wishgranter wishes, fixes unintentional nerf to Dragons Tooth

* Updates teleporter code to actually work

* Now with 120% more paranoia!
2018-03-16 03:34: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
Useroth e4778dc751 Makes shock collars actually obtainable from KinkMates. (#5938) 2018-03-16 03:20:08 -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
Poojawa 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -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
Anonymous 542f9c63c7 Adds check if item is sharp
So you won't get false negative mood for playing with plushes.
2018-03-13 15:48:26 +03:00
Anonymous b20984af89 B for Bad Grammar 2018-03-13 15:38:33 +03: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
Anonymous f3f0a06c57 Adds positive moods for headpatting, hugging box of hugs and playing with plush.
Also, you will now receive negative mood for butchering plush and trying to pet such plush.
2018-03-11 12:16:07 +03:00
deathride58 45b473f14d Merge pull request #5843 from Poojawa/trek-outfits
Trek outfits
2018-03-09 18:46:11 +00:00
deathride58 32812ce624 Merge pull request #5827 from NopeMcHaltman/goddamnit
Nymphotrait
2018-03-09 18:44:05 +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
NopeMcHaltman cdd9bd29d2 Merge branch 'master' into goddamnit 2018-03-07 16:20:17 +03:00
Anonymous b2a2165bfe Moves code into modular folder
Also fixes grammar. At least I hope.
2018-03-07 16:11:48 +03:00