Commit Graph

8883 Commits

Author SHA1 Message Date
Kyep
9a3ecd6383 Fix runtime when activating internals while smoking 2020-09-24 14:00:39 -07:00
SteelSlayer
01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196)
* proximity monitor

* Update code/__HELPERS/unsorted.dm

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

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-20 13:31:16 -04:00
farie82
81682dc626 Adds muzzle flashes for guns depending on the ammo (#13322)
* Muzzle flashes added for guns

* Use an muzzle flash effect now.

* Unused var

* sillenced guns have a lower alpha muzzleflash effect
2020-09-20 12:41:45 -04:00
AffectedArc07
b093b189d9 Merge pull request #14388 from Edan52/tgui-tankdispenser
[TGUI] tank dispenser
2020-09-20 10:26:39 +01:00
Edan52
9fe8addb84 Update
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-20 10:17:42 +01:00
Kugamo
fbf1935def Reworks floor/airlock/pipe painters' sprites and sounds. (#14379)
* Adds new sprites, and sounds to painters.

* Adds check, and inhand sprites

* minor fixes on sprotes
2020-09-19 20:15:54 -04:00
Edan52
08231fc897 tankdispenser 2020-09-19 21:23:40 +01:00
Dovixx
b35a9f3af3 Add the checks 2020-09-19 23:16:59 +03:00
AffectedArc07
ff26229f34 Merge pull request #14099 from Kyep/skills_rework
Replaces skills computer with skills HUD glasses
2020-09-19 15:00:21 +01:00
AffectedArc07
a896bc825f [TGUI] Camera Consoles (Actual Magic) (#13750)
* TGUI Camera Consoles

* inb4 I fail my own CI routines

* Makes it so AIs cant use cam consoles

* Refactors camera bugs
2020-09-19 09:55:33 -04: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
AffectedArc07
c5fece9cfe Merge pull request #14383 from TDSSS/donk-fix
The return of the donk
2020-09-19 14:06:29 +01:00
TDSSS
6e7ca4000f fix donks 2020-09-19 14:51:10 +02:00
TDSSS
33f600d0d3 Spray logging improvement (#14331)
* better logging

* now with target
2020-09-18 19:41:46 -04:00
dearmochi
101ad5b617 Ports security webbing from /tg/ (#14354)
* Ports security webbing from /tg/

* Can only be purchased from cargo (15 pts for 3)
2020-09-18 18:53:42 -04:00
RedWolfie
61b122aaf3 corrected blind message when knocking someone off a table (#14370) 2020-09-18 12:47:53 -04: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
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
Kyep
423355db48 AA requests 2020-09-18 01:25:12 -07:00
Kyep
a62268429c Fixes radios ignoring internal_channels 2020-09-17 19:00:47 -07: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
Kugamo
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
AffectedArc07
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
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
Shadow-Quill
71e7306706 Change
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-16 15:01:12 -05:00
Kyep
65018edeac Fixes ex_act runtime (#14026)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-16 15:39:00 -04:00
AzuleUtama
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
Shadow Quill
bd1d83f27d Auto stash before revert of "Merge pull request #14289 from Dovixx/SSD-portal" 2020-09-16 14:17:04 -05:00
AffectedArc07
c5597b9372 Merge pull request #14291 from Kyep/tgui_id_computer
[TGUI] ID Computer
2020-09-16 20:10:42 +01:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
variableundefined
185b5c4a08 Merge pull request #13994 from Bizzonium/tweakMechaTeleportation
Fix and tweak teleportation for mecha
2020-09-16 12:14:34 -04:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
Kyep
7b78232276 Reworks Baseball Bat (#14186)
* Adjusts baseball bat

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-16 10:16:21 -04: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
Kyep
eb464ebd24 fixes merge conflict 2020-09-16 06:54:30 -07: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
variableundefined
a6d6d0591d Merge pull request #13489 from AzuleUtama/uplinkBundleTweaks
Improves Hacker and Payday uplink bundles
2020-09-16 09:02:54 -04:00
variableundefined
fc7af0f5a4 Merge pull request #13883 from ppi13/patch-2
Removes GPS from Lavaland Tendrils
2020-09-15 20:08:19 -04:00
Kyep
07b4ff1354 merge conflict fix 2020-09-15 17:04:39 -07: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
Kyep
00b458be3e fixes merge conflict 2020-09-15 15:34:50 -07:00
Kyep
995165ae38 fixes merge conflict 2020-09-15 11:39:00 -07:00
Kyep
995a7c66e5 Fixes AI being unable to change radio settings 2020-09-15 11:13:10 -07:00
AffectedArc07
c39e00d7fc Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14059 2020-09-15 17:16:57 +01:00
Kyep
28d915b26f fixes merge conflict 2020-09-15 08:40:03 -07:00