Commit Graph

101 Commits

Author SHA1 Message Date
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
AnturK
b8bb30d3de Removes some unused code. (#37449) 2018-04-27 10:33:10 -05: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
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
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815)
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
2018-03-05 15:20:59 -06:00
kevinz000
28e91caec3 World time stat mc panel (#36111) 2018-03-04 14:54:01 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
LetterJay
396245d85f Update mob.dm 2018-01-27 14:16:47 -06:00
coiax
6d9e8110f5 Mobs start with a random nutrition amount 2018-01-26 19:56:09 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314)
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
2018-01-21 21:39:46 -06:00
deathride58
e944dbef9c Merge pull request #4930 from Citadel-Station-13/upstream-merge-34236
[MIRROR] Antag Panel / Check antagonists Refactor
2018-01-19 19:33:25 +00:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
AnturK
6354c6eec5 Moves creating tag before intialization (#34512)
* Moves creating tag before intialization

* Two nukes for price of one.

* coord
2018-01-19 08:41:24 -06:00
Poojawa
e385ab090e Fixes message visibility for vorish play
It's the little things I have to prune.
2018-01-14 12:01:24 -06:00
Jordan Brown
edfa926886 Move a definition to the right file (#34288) 2018-01-11 21:31:13 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-11 14:03:52 -06:00
deathride58
6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
oranges
1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
deathride58
bdd460ed4a mob folder - root 2018-01-04 01:02:04 -05:00
Jordan Brown
19c35c63d6 Merge pull request #33951 from AnturK/perspective_fix
Fixes reset_perspective runtimes
2017-12-31 09:58:02 -06:00
Leo
868fbec32d Merge pull request #33881 from AnturK/walls-have-eyes
Makes reset_perspective handle turf as eye
2017-12-29 00:28:18 -06:00
deathride58
36d8ff1811 Update mob.dm 2017-12-27 21:48:18 -05:00
kevinz000
c8788ed4f7 adds handholding 2017-12-27 16:20:44 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
LetterJay
0885c57b39 Update mob.dm 2017-11-14 16:10:46 -06:00
vuonojenmustaturska
8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
LetterJay
14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
vuonojenmustaturska
53c9c16fe3 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 07:14:44 -05:00
deathride58
e7c69850a1 Wait shit what am i doing - fixes voreverbs proper 2017-10-26 14:31:55 -04:00
LetterJay
dd53de8859 Update mob.dm 2017-10-23 14:15:43 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
CitadelStationBot
f19665e698 [MIRROR] Fixes another stack overflow in pull code (#3515)
* Merge pull request #31905 from AnturK/anotherloop

Fixes another stack overflow in pull code

* Fixes another stack overflow in pull code
2017-10-20 01:42:18 -05:00
kevinz000
0aa2e6b6a2 Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes (#31609)
* Update alert.dm

* better fix
2017-10-19 02:01:14 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
oranges
cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
2017-10-05 03:05:32 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
LetterJay
6a8ca2e02c Merge branch 'master' into upstream-merge-31037 2017-10-01 02:53:03 -04:00
AnturK
6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00