Commit Graph
49705 Commits
Author SHA1 Message Date
farie82andGitHub 8e8ad65906 Makes most targeted spells select a target on click with a radius (#13220)
* Basis

* Make most targeted spells use a click with radius instead of a list

* Fixes

* Selection code

* return ..()

* Auto targeting

* Forgot a comment change

* Merge issue fix
2020-09-18 10:30:32 -04:00
AffectedArc07andGitHub 84c6b4ab2f Merge pull request #14366 from Kyep/borg_radio_fix
Fixes cyborg radios
2020-09-18 11:10:39 +01:00
Kyep 2e37b10cbf fixes cyborg radios 2020-09-18 03:03:37 -07:00
AffectedArc07andGitHub 07b65149fa Merge pull request #14360 from Kyep/radio_fixes
Fixes station bounced radios / intercomms
2020-09-18 09:38:08 +01:00
Kyep 423355db48 AA requests 2020-09-18 01:25:12 -07:00
KugamoandGitHub d7fd219c87 alters description of rubber ducky prize (#14340) 2020-09-18 01:18:35 -04:00
KugamoandGitHub 3df2f3ac4e Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)
* Adds Botany Jugs, and lid test for hydro trays

* adds 1u and 2u transfer amounts back to changed items

* fixed item references in some .dmm

* improves weed/pest killer jug sprites, and corrects overlays procs

* removes uneeded image def

* improves sprites further

* adjusts coloring of l4z reagant

* Buffs Jugs to 80u each (from 50u)

* balances nutrient vending numbers

* resizes jugs

* fixes conflict in .dmi

* Resizes Jugs again

* removes commented out code

* Fixes

* futher fixes

* Fixes some issues, adds sounds for jugs.

* reverts to using New()

* removes jug.dm and reverts all nutrient back to bottles
2020-09-18 01:14:19 -04:00
Kyep a62268429c Fixes radios ignoring internal_channels 2020-09-17 19:00:47 -07:00
farie82andGitHub 67e6cf5079 Scan mind and Project mind now use vision to determine the naming in the target list (#12963)
* Scan mind and Project mind now use vision to determine the naming

* Copy pasta mistake fix

* logic fix with name dupe prevention

* Refactor ala review
2020-09-17 18:31:08 -04:00
e135c2326b Terror Princess Rework (#13657)
* rework queen eggs, princess caste

* add trailing newlines for travis

* refactor for code standards

* Remove old/incorrect comment from queen.dm

* refactor purple.dm, add notification for which area queen is in

* princesses no longer lose ventcrawl or gain wallsmash when nesting, deletes MassFlicker()

* add status tab info for purples about where their queen is

* Simplified princess code: removed NestMode(), NestMode2().

* makes terrors use 'bite' animation when attacking something

* status tab spider regeneration helptext

* converts queen spit from TOX to BURN, empress single-fire

* fixes terror gender, double-examine text. add terrors closing airlocks, remove queen wrap

* newline for travis

* alter terror spider event balance depending on server pop

* white infection sequence: gray, red, brown, green, green

* moves #define isterrorspider(A) to __DEFINES\mobs.dm

* remove typoed comment

* fix: prevent exploit with spam-clicking egglay action button

* fix: prevent AI trying to move spiders after a player takes control of them

* fix bug where terrors bumping an airlock repeatedly could make it both open and close

* clarify comment on event odds

* increase queen spit burn damage from 30 to 40

* add: queen webs are now airtight, instead of dealing damage/hallucination

* remove spider alert for already-controlled spiders

* queen spit naming fix

* travis newline

* encourage princesses to remain outside vents

* fixes calls to CountSpidersDetailed not using list()

* makes it easier to debug away mission AI

* code quality: more typeless loops

* add: killing a queen, also kills most of her offspring

* remove walk fix, for splitting into another PR

* remove events\spider_terror.dm changes, move to another PR

* makes it compile - will still require merge conflict resolving later.

* fix: purple webs cause purples to lose sign of queen and die

* visible-> near for purples

* fix wrong gender on spiders

* queen spit now damages structures (like mechs) and other spiders

* ghost spacing

* show queen living time on examine

* Fixes #12969 - terrors getting stuck in web

* revert all changes to purple.dm

* farie requests 1

* farie refactoring II

* var/list/spider_array

* var/list/spider_totals

* more farie

* queen examine laycount, initial eggcount

* terror heat vulnerability, refactoring 1/0 vars

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-17 18:29:32 -04:00
AffectedArc07andGitHub 5cafb0bf16 Merge pull request #14358 from dearmochi/fix-atmos-console-cache
Fix atmospherics control UI not refreshing data correctly
2020-09-17 22:15:49 +01:00
mochi d2780648cf Fix atmos control not refreshing data correctly 2020-09-17 23:03:08 +02:00
AffectedArc07andGitHub ded5015bc0 Merge pull request #14351 from Marginalorb/silver-slime-blacklist-update
Adds abstract meat to silver slime blacklist
2020-09-17 21:19:16 +01:00
AffectedArc07andGitHub 5b10278f9c Merge pull request #14356 from SteelSlayer/fix-objective-printing
Fixes terrible text formatting with the end of round traitor info
2020-09-17 20:41:31 +01:00
SteelSlayer 15de90ce27 fix traitor EOR info 2020-09-17 14:14:09 -05:00
AffectedArc07andGitHub e66a0a3644 Merge pull request #14353 from kugamo/scubber-sprote
Fixes bouncing scrubber
2020-09-17 18:48:58 +01:00
Kugamo d5b6c01fea fix 2020-09-17 12:27:52 -05:00
Marginalorb 45507f0efe Adds abstract meat to silver slime blacklist 2020-09-17 12:21:15 -04:00
AffectedArc07andGitHub 891a368484 Speedfix documentation generator (#14350) 2020-09-17 11:31:20 -04:00
AffectedArc07andGitHub cc4bec9a17 Merge pull request #14345 from dearmochi/py-midi2piano-new-limits
Match py-midi2piano music limits with new ones
2020-09-17 14:02:48 +01:00
AffectedArc07andGitHub 706a3756bf Merge pull request #14344 from Kyep/tgui_robotics_borg_charger_fix
Fixes borgs in charger not showing on robotics console
2020-09-17 14:02:18 +01:00
mochi debb8e22c0 Match py-midi2piano music limits with new ones 2020-09-17 09:20:08 +02:00
Kyep 084f7b2ed0 Fixes #14342 2020-09-16 22:47:52 -07:00
KugamoandGitHub 55249e2862 Adding wearability to fried vox trash (#13978)
* code to add head wearing functionality to fried vox trash
2020-09-16 18:58:00 -04:00
KugamoandGitHub 27edf99e06 Adds rubber ducky shoes (#13996)
* adds rubberduckyshoes item

* Adds crafting recipe for rubber ducky shoes

2 rubber duckies, 1 sandal using Wirecutters

* Adds icon for rubberducky shoes

* Adds character sprites for rubberducky shoes

* Adds in hand sprites for rubberducky shoes

* removes pointless variable, and I redid the description.

* Adds rubber ducky to the merch console

done since theres normally only 3 ducks on station, giving some more access to duckies I think is warrented. This might be to much.

* Adds species specific sprites for Vox and Drask

* removes pointless list

* moves crafting recipe to clothing category

* Removes entry in merch console, adds entry in prize vendor

* Revert "moves crafting recipe to clothing category"

This reverts commit b80c398b46b3e60a10b78461d753b6ef6e3ac88b.

* Revert "Removes entry in merch console, adds entry in prize vendor"

This reverts commit c4ae6c3767d2d5ad072ae5befcb1f66b99cb6c63.

* Adds entry into arcade prize vendor

* Removes entry in merch console

* adds crafting recipe to clothing category

* removes recipe from misc category

* corrected messed up sound file location

* Updates icons/mob/feet.dmi

* Updates icons\obj\clothing\shoes.dmi

* improved the item icon

* deconflict
2020-09-16 18:29:49 -04:00
AffectedArc07andGitHub 9e687ffc4c Merge pull request #14318 from Kyep/autoreconnect_merge_delay
Server awareness of pending updates
2020-09-16 22:32:27 +01:00
AffectedArc07andGitHub 170b05864b Merge pull request #14336 from Kyep/jobs_runtime_fix
Fixes a jobs.dm runtime when an explorer is transferred
2020-09-16 22:29:40 +01:00
AffectedArc07andGitHub be3c9edc1e Merge pull request #14333 from SteelSlayer/tgui-mixer
[TGUI] Atmos Mixers
2020-09-16 22:21:52 +01:00
Kyep 45f7138f28 jobs.dm:666 fix 2020-09-16 14:18:14 -07:00
AffectedArc07 a5c8c9aae6 Merge remote-tracking branch 'ParadiseSS13/master' into pr/SteelSlayer/14333 2020-09-16 22:12:32 +01:00
AffectedArc07andGitHub b568b092c0 Merge pull request #13961 from Shadow-Quill/AICardTGUI
[TGUI] Intellicard transformation
2020-09-16 22:05:30 +01:00
Shadow Quill f79e531118 Change II 2020-09-16 15:52:52 -05:00
AffectedArc07andGitHub 6d72554dd6 GitHub actions hosted auto documentation (#13984)
* GitHub actions hosted auto documentation

* V2

* Link updates

* Remove shameless plug
2020-09-16 16:39:35 -04:00
SabreMLandGitHub 4c9a3cb4a0 Fixed backpack positioning (#14334) 2020-09-16 16:38:54 -04:00
TDSSSandGitHub 328b7fa8d8 ERT idiotproofing and minor tweaks (#13834)
* makes ert more robust

* renamed and tweaked

* idiot proofing of ert

* I cannot into git, oops

* removed the anti-stun from code red erts again

* removed implied src
2020-09-16 16:38:25 -04:00
SteelSlayer 395dd7df75 tgui mixer 2020-09-16 15:05:42 -05:00
71e7306706 Change
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-16 15:01:12 -05:00
farie82andGitHub 915e0913a9 Make spell buttons light up slowly when recharging (#13200)
* Make spell buttons light up slowly when recharging

* Recharge percentage

* whoops
2020-09-16 15:41:02 -04:00
65018edeac Fixes ex_act runtime (#14026)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-16 15:39:00 -04:00
SabreMLandGitHub b937ed1021 Update z2.dmm (#14162) 2020-09-16 15:37:36 -04:00
AzuleUtamaandGitHub 8cf7051cb9 Energized fire axe rework (#13907)
* Energized axe reworked and now subtype of regular axe
2020-09-16 15:36:39 -04:00
Shadow Quill 82b0a4b2f5 Request 2020-09-16 14:34:33 -05:00
AffectedArc07andGitHub 1c64c64f98 Merge pull request #14332 from farie82/voodoo-logging-fix
Use user for the log_say for the voodoo doll
2020-09-16 20:21:54 +01:00
Shadow Quill 21fa415f6f Deconflicting III 2020-09-16 14:18:50 -05:00
Shadow Quill bd1d83f27d Auto stash before revert of "Merge pull request #14289 from Dovixx/SSD-portal" 2020-09-16 14:17:04 -05:00
AffectedArc07andGitHub 317eb76485 Removes immersion breaking text to speech (#14251) 2020-09-16 15:15:07 -04:00
AffectedArc07andGitHub c5597b9372 Merge pull request #14291 from Kyep/tgui_id_computer
[TGUI] ID Computer
2020-09-16 20:10:42 +01:00
joep van der velden 79fd123f4d Use user for the log_say for the voodoo doll 2020-09-16 21:05:36 +02:00
SteelSlayerandGitHub cee8a464df Makes mindslaves appear on the round end antagonist listing (#14224)
* traitor score screen

* includes slaved by text

* line break

* update size of mindslave text to match traitor
2020-09-16 15:02:48 -04:00
2e9b2fe7e3 taking AA's suggestion
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-16 18:47:38 +00:00