Commit Graph

57 Commits

Author SHA1 Message Date
kevinz000
36cebc733c Merge pull request #11039 from Ghommie/Ghommie-cit572
Something about a couple runtimes.
2020-02-15 12:19:50 -07:00
Ghommie
62ff589840 Something about a couple runtimes. 2020-02-12 09:10:24 +01:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
2020-02-10 04:16:14 -07:00
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Ghommie
67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
b2d82bd1f1 Applying upstream fixes. 2019-06-17 00:27:07 +02:00
Ignari-Coldstorm
eb7f5634d5 Changes Jukebox Availability (#7905)
Changes the massive price of the jukebox to something much more affordable, as well as broadens access needed to use it.
2019-01-08 02:30:24 -08:00
deathride58
c95dcbe6ac HOPEFULLY fixes jukebox destruction not taking jukeboxes out of active jukebox list (#7604) 2018-10-03 20:37:45 -07:00
deathride58
faa2b39ca2 buffs jukeboxes - makes jukebox sounds have double the falloff (#7458) 2018-08-14 23:07:22 -07:00
deathride58
d4146db593 Jukebox rework + environment/reverb controls for sounds played via playsound_local (#7367)
* Reworks jukeboxes - Makes jukeboxes a subsystem, adds realtime directional jukebox audio, adds environment/reverb controls to sounds played with TG procs

* fixes my stupidity, has no effect at all outside of boombox local branch

* minor optimizations, fixes jukebox sound not updating at all when the source is on a different z-level
2018-07-20 03:39:07 -07:00
deathride58
8b58db057e Merge pull request #7355 from Citadel-Station-13/upstream-merge-38934
[MIRROR] Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects
2018-07-10 01:56:32 -04:00
vuonojenmustaturska
417496aa6e Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects (#38934)
* Wrap setting anchored for structures, fix atmos bug

* forgot this

* Add a signal for setanchored

* move setanchored to obj

* machinery, also some structure stuff

* tabbing
2018-07-06 13:28:01 -05:00
kevinz000
04993d4dba Update dance_machine.dm 2018-07-06 08:16:41 -07:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
LetterJay
e544f0fe29 Update dance_machine.dm 2018-05-26 21:40:10 -05:00
LetterJay
393676aa3e Update dance_machine.dm 2018-05-26 18:39:20 -05:00
Jordan Brown
2bcfe00283 Fix some inconsistencies relating to resting 2018-05-25 10:56:47 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
ce946619b3 Merge pull request #6348 from Citadel-Station-13/upstream-merge-37088
[MIRROR] Fix double-fullstop in the jukebox's description
2018-04-11 21:35:21 +00:00
ShizCalev
f344bc76fe Fixes jukebox ghost message spam (#37107) 2018-04-11 07:31:57 -05:00
Tad Hardesty
ae16d62178 Fix double-fullstop in the jukebox's description (#37088) 2018-04-11 05:15:19 -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
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
2018-04-05 00:17:27 +00:00
deathride58
e930b98beb Update dance_machine.dm 2018-04-04 16:59:18 -04:00
LetterJay
e4c6ce0a98 Update dance_machine.dm 2018-04-01 19:53:15 -05:00
KorPhaeron
01ff7cf8da Refactors Dance Machine + deletes a bunch of sound files 2018-04-01 09:42:14 -05:00
deathride58
7977ac2818 Update dance_machine.dm 2018-03-27 13:50:40 -04:00
Gaz Wilmbroke
d5822a4cbb Hotfix for #36688 - Excludes non-carbon-based life from the disco machine's dance4 proc to fix pAI "resting/getting up" chat spam 2018-03-26 17:18:35 -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
CitadelStationBot
b1e9ca385f [MIRROR] Adds yeehaw to the discoball dj soundboard (#5254)
* yeehaw (#35172)

* Adds yeehaw to the discoball dj soundboard
2018-02-04 22:30:10 -06:00
ShizCalev
a0098744c8 Reinvigorates the disco inferno 2018-01-21 01:29:42 -06:00
Dax Dupont
af73323477 Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260)
* Dance machine fix

* I have no ass and i must blast
2018-01-11 21:36:56 -06:00
oranges
ac95eb06e8 Dance Machine now obeys instrument preference (#33607) 2017-12-17 15:02:31 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
CitadelStationBot
3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
833c0c549c Make dance machine mob dancing asynchronous (#1221) 2017-05-27 13:35:52 -07:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
47fa8353eb [MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710)
* Moves playsound_local() to mob and gets rid of a useless proc.

* Fixes compile errors
2017-05-18 01:39:16 -05:00