Commit Graph

144 Commits

Author SHA1 Message Date
Jordan Brown
62d6329f56 Condenses a check 2018-04-29 10:03:39 -05:00
Poojawa
f2b0456dc5 defines, helpers, onclick 2018-04-22 23:56:25 -05:00
Robustin
a79a168d2c Cult spell buttons will no longer hold an empty slot in the regular action bar (#36791) 2018-04-11 05:08:47 -05:00
Jordan Brown
0a9ca8b073 Merge pull request #37050 from AutomaticFrenzy/patch/fullscreen-cloning
Fix fullscreens added to clientless mobs not stretching properly
2018-04-10 19:23:28 -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
CitadelStationBot
4f6fc9affa [MIRROR] fixes lava planet appearing in transit / wrong z level (#6067)
* boom goes the dynamite (#36590)

* fixes lava planet appearing in transit / wrong z level
2018-03-22 06:11:08 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
Qustinnus
f7a8a96536 Lavaland / Lavaplanet is now visible from space (#36419)
* adds lava planet

* fixes oldcode

* im dumb

* Random position

* UHHHH, I'll take a diet lavaplanet please, no ice.

* fixes init
2018-03-17 07:54:21 -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
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
Robustin
e9d3af6e61 The ARM is now harder to obtain (#36051)
* Added ARM difficulty

* Working edition Pt1

* Actually working Pt2

* Appropriate null check?

* Update narsie.dm
2018-03-09 02:17:46 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -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
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
2018-03-02 23:37:41 -06:00
CitadelStationBot
8543df055d [MIRROR] Add parallax sprites from RIS (#5749)
* Add parallax sprites from RIS (#36049)

* Add files via upload

* Update parallax.dm

* Add parallax sprites from RIS
2018-03-02 18:35:35 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
CitadelStationBot
0ad6fe35e0 [MIRROR] [s] Fixes observers being able to create areas (#5724)
* [s] Fixes observers being able to create areas (#36006)

* Fixes observers being able to create areas

* Exception for admin ghosts

* [s] Fixes observers being able to create areas
2018-02-27 05:04:00 -06:00
deathride58
a3180b0173 Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431
[MIRROR] html_interface removal and crew monitoring console refactor.
2018-02-16 14:27:26 +00:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
Jordan Brown
7b493c30d7 Merge pull request #35664 from AnturK/tooltipruntimes
Fixes some tooltip runtimes
2018-02-15 10:38:27 -06:00
Slignerd
afcdb771b3 Squashes silicon HUDs together (#35212)
* Squashes silicon sensors together

* Fixes proc names

* Brings back individual sec/med huds for pai usage

* This fixes the pai

* Fixes toggle text
2018-02-07 02:32:14 -06:00
deathride58
09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
CitadelStationBot
f02529555c [MIRROR] Fix roundend splash screens (#5242)
* Fix roundend splash screens

* Update screen_objects.dm
2018-02-02 01:22:56 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
deathride58
625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606
[MIRROR] Config dir again except this time it works
2018-01-21 22:41:13 +00:00
LetterJay
923b72e138 Update ghost.dm 2018-01-21 14:19:48 -06:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
Jordan Brown
c36b095146 Fixes ghost show_hud runtime 2018-01-21 09:14:50 -06:00
deathride58
cf538efeb7 Update credits.dm 2018-01-19 08:47:27 -05:00
Leo
a0f815c5c4 Revert "Fix config_dir usage (#34469)" 2018-01-18 19:38:40 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Tad Hardesty
06120d3174 Grammarize the internals screen object 2018-01-13 04:36:43 -06:00
deathride58
af96f58ffd syncs defines 2018-01-03 23:15:49 -05:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
YPOQ
6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
LetterJay
14472e5139 Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485
[MIRROR] code improvements from mso and co
2017-12-26 07:38:17 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Armhulen
55ee64940f code improvements from mso and co 2017-12-18 20:50:07 -06:00
LetterJay
d384941d5c Update robot.dm 2017-12-17 15:56:44 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -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
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
0475ef46f7 Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150
[MIRROR] Makes actionbuttons remember positions where you locked them.
2017-12-10 23:04:34 +00:00
jammer312
c55b914f06 Makes actionbuttons remember positions where you locked them. 2017-12-08 10:33:54 -06:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
deathride58
c56003f6ff Adds support for non-1:1 screen ratios (Doesn't add widescreen) (#32950)
* adds support for non-1:1 screen ratios for fullscreen overlays

* prevents future copypasta, adds widescreen support to clickcatchers

* oops, makes it actually compile

* HOPEFULLY makes it actually compile, makes projectiles and mouse_angle_from_client support widescreen

* i need shittier shitcode

* !!!HOPEFULLY!!! fixes the screen fuckery

* Fixes compiling errors. Tested locally, it seems like it works

* fixes runtime in mouse_angle_from_client

* Fixes non-1:1 TGUI runtimes for borgs and ghosts

* adds actual defines for fullscreen overlay resolution

* makes varediting view call change_view to make clickcatcher regenerate proper

* testmerge toggle widescreen verb and fixes vving view

* FUCK - fixes test verb to properly use change_view, so clickcatchers regenerate and such

* fixes parallax runtimes - how'd i miss this

* removes debug verb
2017-12-05 19:46:20 -06:00
deathride58
ac4ca767d0 Merge pull request #3987 from deathride58/manualmirror1
Manual mirror of https://github.com/tgstation/tgstation/pull/32496
2017-11-19 07:47:33 +00:00
deathride58
794bfb18c1 Manual mirror of https://github.com/tgstation/tgstation/pull/32496 2017-11-17 09:49:26 -05:00