Commit Graph

22260 Commits

Author SHA1 Message Date
farie82
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
Kyep
2e37b10cbf fixes cyborg radios 2020-09-18 03:03:37 -07:00
AffectedArc07
07b65149fa Merge pull request #14360 from Kyep/radio_fixes
Fixes station bounced radios / intercomms
2020-09-18 09:38:08 +01:00
Kugamo
d7fd219c87 alters description of rubber ducky prize (#14340) 2020-09-18 01:18:35 -04:00
Kugamo
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
farie82
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
Kyep
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
Marginalorb
45507f0efe Adds abstract meat to silver slime blacklist 2020-09-17 12:21:15 -04:00
Kugamo
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
TDSSS
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
AffectedArc07
317eb76485 Removes immersion breaking text to speech (#14251) 2020-09-16 15:15:07 -04:00
AffectedArc07
c5597b9372 Merge pull request #14291 from Kyep/tgui_id_computer
[TGUI] ID Computer
2020-09-16 20:10:42 +01:00
AzuleUtama
52eaaf5003 Reworks minor addictions for all addiction stages (#14297) 2020-09-16 14:40:04 -04:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
variableundefined
2c6c9d495e Merge pull request #14329 from Cocacolagua/grinds-my-gears
Adds periods to some emotes
2020-09-16 11:50:13 -04:00
variableundefined
d9a8da98bb Merge pull request #14028 from SteelSlayer/spawn-removal
Some spawn removals and other assorted code cleanup
2020-09-16 11:47:59 -04:00
Kyep
5d2363949f Fixes & Reworks Rogue Combat Drone Event (#14040)
* combat drone rework
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-16 11:25:34 -04:00
Cocacolagua
64beb81db1 emotes to standard 2020-09-16 12:18:06 -03:00
Cocacolagua
cf279cdcfa Detective Revolver Nerf (#14219)
* det revolver nerf
2020-09-16 10:54:55 -04:00
SteelSlayer
72f80091bc fix after upstream merge 2020-09-16 09:38:57 -05:00
Kugamo
55fcdbc503 Adds PDA lamps and in-PDA ID sprites (#14032)
* Adds sprite for PDAlight, references it, and alters PDA sprites to add off bulbs & redoes all the ID-in-pda sprites, and reorganizes the dmi.
2020-09-16 10:38:49 -04:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
SabreML
dd326096c9 Allows toy E-Swords to reflect Laser Tag lasers (#14191)
* Allows toy eswords to reflect laser tag lasers
2020-09-16 10:13:32 -04:00
ppi13
0b23e89fa5 Balances the safety override module and Fixes #14172 (#14177)
* Change safety override tech requirement and make it only unlock weapons instead of having the same effect as emag
2020-09-16 10:06:49 -04:00
RedWolfie
f86a64a3a1 made emagged drones obey their death timer (#14287)
* made emagged drones obey their death timer
2020-09-16 09:56:34 -04:00
Kyep
eb464ebd24 fixes merge conflict 2020-09-16 06:54:30 -07:00
denghis1
845e7a8b75 Added the warning cone as a headpiece for Ian (#14216)
* Added the warning cone as a headpiece for Ian
2020-09-16 09:52:40 -04:00
Lumi
08e92ee6a7 Adds pancakes. (#14130)
* Pancakes

Adds pancakes, berry pancakes and choc-chip pancakes.
2020-09-16 09:41:42 -04:00
joep van der velden
0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
AffectedArc07
0a79d49b56 Merge pull request #14301 from SabreML/Fluffy-change
Pineapple Salad fluff sprite change
2020-09-16 13:54:19 +01:00
mochi
84982acdf2 Add missing tab?? 2020-09-16 13:25:54 +02:00
mochi
4a364fcbfb Clear null chords from music to fix runtime 2020-09-16 13:12:17 +02:00
mochi
ceb427fd64 Fix synthesized music's last note cutting short 2020-09-16 13:11:41 +02:00
mochi
8e4784579e Fix music transcending Z-levels 2020-09-16 13:09:54 +02:00
variableundefined
1d5358f79b Merge pull request #14215 from AffectedArc07/removes-omni-atmos
Removes omni gas devices
2020-09-15 22:27:42 -04:00
variableundefined
ac1d7478fd Merge pull request #14211 from Qwertytoforty/ACKCHYUALLY
Corrects the description of Stimulants and Stimulative Agent
2020-09-15 21:01:01 -04:00
variableundefined
2ca98f2267 Merge pull request #14217 from Kyep/crabwalking
Crabwalking now causes slowdown similar to walk speed
2020-09-15 21:00:11 -04:00
Kyep
07b4ff1354 merge conflict fix 2020-09-15 17:04:39 -07:00
variableundefined
19eba6b06d Merge pull request #14178 from SabreML/Borg-tweaks-1
A couple of Cyborg tweaks
2020-09-15 19:53:51 -04:00
variableundefined
db06596ffa Merge pull request #14283 from SabreML/Fire-Lighting
Makes cigarettes catch fire if their holder is also on fire
2020-09-15 19:41:02 -04:00
variableundefined
b2cd812d04 Merge pull request #14289 from Dovixx/SSD-portal
Makes the list SSDs and AFKs panel spawn the NT SSD teleportation portal
2020-09-15 19:37:24 -04:00
variableundefined
1276fb4402 Merge pull request #14285 from Sinestia/master
Turn off xenobiology camera acceleration
2020-09-15 19:36:51 -04:00
Kyep
00b458be3e fixes merge conflict 2020-09-15 15:34:50 -07:00
AffectedArc07
e02917f69f Merge remote-tracking branch 'ParadiseSS13/master' into pr/RedWolfie/14258 2020-09-15 22:04:01 +01:00
AffectedArc07
00c09f7f34 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14225 2020-09-15 21:13:03 +01:00
AffectedArc07
d587b05d02 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14200 2020-09-15 21:00:07 +01:00
AffectedArc07
2e29a1ddcb Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190 2020-09-15 20:46:10 +01:00
AffectedArc07
848bfee01b Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14176 2020-09-15 20:36:24 +01:00
AffectedArc07
0c33f1a511 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14166 2020-09-15 20:24:29 +01:00