Commit Graph

22290 Commits

Author SHA1 Message Date
mochi
be0db9984b Make dreamchecker happy 2020-09-19 20:30:27 +02:00
mochi
5e40da0a13 Merge branch 'master' into tgui-login-plugin 2020-09-19 17:03:00 +02:00
mochi
f30dffc6b7 Creates login plugin for TGUI to streamline and unify login frontend and backend 2020-09-19 16:48:48 +02:00
Kyep
c303256d19 AA request 2020-09-19 06:49:01 -07:00
Kyep
be024bbbcc Merge remote-tracking branch 'ParadiseSS13/master' into skills_rework 2020-09-19 06:39:38 -07:00
AffectedArc07
ce2f0d401d Swings the axe on modular consoles (#14355)
* Swings the axe on modular consoles

* Experience will not save you in these parts
2020-09-19 09:36:56 -04:00
Kyep
9a50149fa2 Terror princess egg / wrap fixes (#14380)
* fix princess egg timer text implying the wrong egg generation rate

* fix terror corpses being wrappable in some situations

* Princesses now get a warning to get out of the vent every 30 seconds

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-19 00:00:10 -04:00
Kugamo
172e4ac1ca Adds Atmos magboots, and tweaks magboot sprites. (#14192)
* Adds sprites for atmosmagboots, and their functionality

* adds atmos magboots to the atmos hardsuit storage units

* Adds gust protection to advanced magboots

* rearranges if and else statements, and corrects missing SPAN

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* deconflict

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-09-18 19:43:42 -04:00
TDSSS
33f600d0d3 Spray logging improvement (#14331)
* better logging

* now with target
2020-09-18 19:41:46 -04:00
farie82
bf5c3131d8 Unusable martial arts now doesn't block normal behaviour (#14377) 2020-09-18 18:52:06 -04:00
EmilyFontaine
3067ce16aa Properly genders Araneus (#14352)
* female araneus

Properly genders Araneus in the code

* Update code/modules/mob/living/simple_animal/hostile/retaliate/pet.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-18 18:49:16 -04:00
RedWolfie
e1559e46a9 Prevents reviving emagged maint drone (#14372)
* stop reviving emagged drone

* revert debug change
2020-09-18 18:39:24 -04:00
mochi
b02c41ba63 Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-18 20:27:23 +02:00
mochi
16d6beaca5 Add NanoMaps to Reload UI Resources verb 2020-09-18 20:26:30 +02:00
AffectedArc07
51245ad1a0 Merge remote-tracking branch 'Paradise/master' into pr/RedWolfie/14328 2020-09-18 17:56:37 +01:00
AffectedArc07
76361cda84 Ports TG's topic limiting (#14330) 2020-09-18 12:47:37 -04:00
Certhic
db5249032d secure fridge tgui 2020-09-18 18:14:13 +02:00
farie82
229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)
* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes
2020-09-18 11:07:19 -04:00
Qwertytoforty
f6b8fe5547 Makes CNS rebooter stun on EMP (#14234)
* Makes CNS rebooter stun on EMP

* Kyets requests

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
2020-09-18 10:44:38 -04:00
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
mochi
976642ddcd Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-18 11:09:26 +02: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
mochi
5e74a76362 Merge branch 'master' into my-nanomaps-cant-be-this-cute 2020-09-17 22:20:49 +02:00
mochi
888ac72650 Refactor NanoMaps, TGUI Crew Monitor 2020-09-17 22:18:57 +02:00
Marginalorb
45507f0efe Adds abstract meat to silver slime blacklist 2020-09-17 12:21:15 -04:00
Certhic
621d03a7fe 2 missing tgui.update 2020-09-17 13:11:07 +02:00
Certhic
0776d349ed tgui_act secure fridge 2020-09-17 13:07:04 +02:00
Certhic
036be0e42c sstgui.update 2020-09-17 11:41:02 +02: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