Commit Graph

163 Commits

Author SHA1 Message Date
Poojawa afac3ae0ab Merge branch 'master' into changelog-memes 2018-09-11 07:52:59 -05:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Poojawa 7a8c76d9cb Update dogborg_equipment.dm 2018-09-08 20:07:44 -05:00
Poojawa 3838a4bd95 Adds intercoms to fetch module blacklist
smh, should probably be an anchored check as well, but who the fuck knows how to make that work with component memes
2018-09-07 13:40:06 -05:00
deathride58 b89203acc7 reduces stam buffer regen time to 1 second (#7504) 2018-09-07 07:26:29 -07:00
Poojawa c22d1cacb8 Adds *insult 2018-08-29 03:25:27 -05:00
DavenPeace1 2209f37a00 Open Galaxy
🆑 Ah yes "Reapers"
add: Finally adds turians, but as a body marking, to have a better look, select the mammal, remove the snout and you won't have any weird looks, you can still add ears and tail, even taur body if anyone is "unique" enough to use it.

🆑 Scolipede, i choose you!!
add: Adds a new whole specie! Scolipede have snout, body marking, taur, tail and ears, for a more good look, try to find dark red colors to fit with it.

add: Added a bit news things, such as bee body marking, insect tail, fish tail and gills which is found in ears, horn for anyone that want to make a demoness or goat, added a tentacle tail, which i can see it will be mostly be used for slimes, the tentacle tail itself was an old sprite of citadel, i only brought back since i found a place to fit it, the real creator of the sprite will have the credit he/she deserves.

fix: Fixed the sprite bug of the octopus taur, it also had it name changed to tentacle
/🆑
2018-08-21 00:02:58 -03:00
slate b3c888bc2e new emotes (#7467) 2018-08-17 12:41:36 -07:00
kevinz000 850eb21df9 Update robot_modules.dm 2018-08-01 16:43:47 -07:00
slate 6337fb77ec ports 3 new borg sprites from rp's codebase to main's. (#7409)
engineering gets a new mr. handy sprite
medical gets a new eyebot sprite
security gets a new spider-tank sprite
2018-07-29 23:29:25 -07:00
deathride58 6cef81d979 It's a feature now - makes it plausible to use custom say verbs in place of emotes (allows proper non-buggy emotes over radio) (#7378)
* it's a feature now - makes it plausible to use custom say verbs in place of emotes

* Makes the thing actually drop the , ""
2018-07-20 03:41:12 -07:00
kevinz000 e3d7ce9793 Update damage_procs.dm 2018-07-16 01:50:33 -07:00
kevinz000 f081239613 Update damage_procs.dm 2018-07-15 23:00:48 -07:00
deathride58 f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58 aee56b1f3d lets dogborg tongues reduce firestacks when they lick faces (#7148) 2018-06-18 11:53:59 -07:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
deathride58 6ac830a123 Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092)
* makes use of 512's filters, adds combat mode toggle component signals, and more

* Update phantomthief.dm

* Update living.dm
2018-05-27 17:18:40 -07:00
deathride58 5f60f30700 Adds custom say verbs, makes yelling echo and penetrate walls, makes distant voices have small text (#6615)
* adds custom say emotes, makes yelling penetrate walls and echo throughout areas

* Update say.dm

* Update say.dm

* Update say.dm

* Update mob.dm

* makes yelling unable to penetrate space
2018-05-23 12:14:18 -07:00
kevinz000 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58 d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498)
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
2018-04-27 07:41:31 -07:00
deathride58 ddd9d670d3 Merge pull request #6484 from DravenPeace1/Branch-2
Branch 2
2018-04-27 09:45:53 +00:00
deathride58 c92d4da83d Merge pull request #6519 from Poojawa/snowflake-protection
Fixes shitcode in slime code
2018-04-27 09:37:11 +00:00
Poojawa 918e4c50eb ensures tails reset taur mode 2018-04-26 07:37:49 -05:00
Poojawa 110878de18 Update jellypeople.dm 2018-04-26 07:27:47 -05:00
Poojawa f29859ddbd fixes my shitcode 2018-04-26 07:27:09 -05:00
Poojawa 95e3a2b266 Fixes shitcode 2018-04-26 07:14:42 -05:00
Poojawa 0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa 832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
DavenPeace1 5fb1eddec9 Even more extras! 2018-04-23 03:40:13 -03:00
DavenPeace1 f5e07db1b5 More extras! 2018-04-18 23:56:43 -03:00
Chayse Ramsay 58111c6482 Fixing slimepeople (#6386) 2018-04-12 08:39:44 -07:00
deathride58 87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Poojawa 75a49c53c8 Fixes dogborg sitting (#6112) 2018-04-01 04:06:10 -05:00
DavenPeace1 7bffe7110b OctopusTime 2018-03-29 18:32:05 -07:00
Poojawa 77872a1526 makes IPCs bleed oil (#6054) 2018-03-24 12:35:17 -07:00
Ziiro b70381c89e Adds IPC Antennas (#6049) 2018-03-24 12:33:19 -07:00
Poojawa 8377bdf9a8 fixes some screen issues 2018-03-20 23:53:55 -05:00
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 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 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
deathride58 035b3458de MDB fix attempt number two. (#5928)
* HOPEFULLY fixes mapdiffbot

* attempt number 2
2018-03-14 17:08: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
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
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
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
kevinz000 5971347949 Nerfhammer 2.0 2018-02-24 14:01:02 -08:00
kevinz000 b631a8dee1 nerfs griefing shits 2018-02-24 09:01:29 -08:00