Commit Graph

36060 Commits

Author SHA1 Message Date
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
d2780648cf Fix atmos control not refreshing data correctly 2020-09-17 23:03:08 +02:00
AffectedArc07
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
SteelSlayer
15de90ce27 fix traitor EOR info 2020-09-17 14:14:09 -05:00
Marginalorb
45507f0efe Adds abstract meat to silver slime blacklist 2020-09-17 12:21:15 -04:00
Kyep
084f7b2ed0 Fixes #14342 2020-09-16 22:47:52 -07: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
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
AffectedArc07
9e687ffc4c Merge pull request #14318 from Kyep/autoreconnect_merge_delay
Server awareness of pending updates
2020-09-16 22:32:27 +01:00
AffectedArc07
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
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
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
SteelSlayer
395dd7df75 tgui mixer 2020-09-16 15:05:42 -05:00
Shadow-Quill
71e7306706 Change
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-16 15:01:12 -05:00
farie82
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
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
AffectedArc07
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
bd1d83f27d Auto stash before revert of "Merge pull request #14289 from Dovixx/SSD-portal" 2020-09-16 14:17:04 -05: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
joep van der velden
79fd123f4d Use user for the log_say for the voodoo doll 2020-09-16 21:05:36 +02:00
SteelSlayer
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
Kyep
2e9b2fe7e3 taking AA's suggestion
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-16 18:47:38 +00: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
Kyep
b7948898bc allow cap/hop (but NOT heads) to terminate any ID on a dept console 2020-09-16 09:15:06 -07:00
variableundefined
185b5c4a08 Merge pull request #13994 from Bizzonium/tweakMechaTeleportation
Fix and tweak teleportation for mecha
2020-09-16 12:14:34 -04:00
variableundefined
c280d4b3b9 Merge pull request #14220 from Qwertytoforty/No-you-can-not-kill-blobs-and-take-5%
Makes protector guardians only do 6 object damage in shield mode
2020-09-16 12:05:24 -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
variableundefined
bda9114547 Bandaids the parallax runtime (#13974) 2020-09-16 11:35:17 -04:00
AffectedArc07
cafe92f93b Fixes duct tape exploit (#13985)
* Fixes duct tape exploit
2020-09-16 11:34:18 -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
Kyep
a3787383f5 notify dept target, refactor / consistent buzz sounds, improved logging 2020-09-16 08:22:58 -07: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
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
Aurorablade
868de60837 Adds some basic say logging to the wicker doll (#14199)
* Adds some basic say logging to the wicker doll
2020-09-16 10:02:04 -04:00
SabreML
b9b163aefb Allows Shadowlings to disable 'Light Floor' tiles (#14316)
* Sling can disable floorlights
2020-09-16 09:58:58 -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