Commit Graph

21515 Commits

Author SHA1 Message Date
oranges
d6b323bcfa Refactors threat assessment for security bots
They don't share a common ancestor type so they were relying on the
secbot having identical vars to the ed209, this is brittle and ugly, so
instead a bitflag of criteria is passed through the mob assess_threat
proc so it can choose how to react to each criteria

As well as that, the weaponscheck proc used by the bots is now passed
through as a callback, more things can now implement their own
weapons checking for threat assessment if they need

This means more things can now utilise the assess_threat proc if they so
wanted to, as they no longer need to map 1 -> 1 to the ed209's vars

Also fixed a runtime where the secbot didn't pass through itself to the
assess_threat proc (what I originally wanted to fix)
2017-06-22 21:05:22 +00:00
Ashe Higgs
4fdd2a37c7 Adds custom lighting support to modular computers, and a flashlight to tablets (#28645)
* Adds light support for modular computers/tablets

* Conflicts 1

* Conflicts 3

* praise the conflicts!

* conflicts again!

* initialize!
2017-06-21 16:42:48 -04:00
Ashe Higgs
cbdcd08691 Malf AI module refactor and small additions (#28334)
* Refactors malf AI modules to modern standards

* Updates the goonchat stylesheet

* Moves air and fire alarm overrides

* squash commits!

* Fixes some things

* Review, fixes

* does the thing!

* Requested changes
2017-06-21 15:35:03 -04:00
Jordan Brown
eadcb5f592 Merge pull request #28648 from nicbn/typo
Slime processor description more readable
2017-06-21 15:28:48 -04:00
Really-Good-Soda-Flavor
40de86de35 Moves reskinning items to /obj (#28558) 2017-06-21 15:19:17 -03:00
Leo
7155f5feb9 Merge pull request #28639 from AnturK/nice-meme
Fixes SM getting energy when hit in space.
2017-06-21 15:16:51 -03:00
Ashe Higgs
35a1d0ec3d Grammar and message tweaks (#28642) 2017-06-21 15:14:27 -03:00
Jordan Brown
e5b1e68147 Adds a configurable message to be sent to mobs on polymorph (#28541) 2017-06-21 09:48:13 -03:00
Leo
930a96e198 Merge pull request #28636 from AnturK/random-runtime
Fixes random runtime
2017-06-21 09:46:28 -03:00
ClosingBracket
ed1855f5c8 Fixed small spelling + punctuation errors (#28631) 2017-06-21 09:43:59 -03:00
Mike Long
39103452a3 Lordpidey devil fixes (#28101)
* Fixes on #28051

* Changes hellfire around some, it's now more consistant.

* Fixes small exploit with infernal jaunt.

* Moves devil antag datum with the rest of the antag datums.

* Corrects syntax errors within codex gigas tgui template.

* Re updates tgui js after merge.

* removes redundant .loc from call.

* Fixes devils sometimes getting duplicate spells.
2017-06-21 10:47:02 +02:00
Jordan Brown
c5e67b5ce1 Merge pull request #28619 from ChangelingRain/taserfix
Tasers and projectiles stun for the proper amount
2017-06-20 21:05:15 -04:00
Kyle Spier-Swenson
491bdace5d Makes movement delay calculation not round to the tick (#28616)
* Makes movement delay calculation not round to the tick

* Fix some fuckups

* How'd that get there

* With squash merging I don't have to feel ashamed about this commit message
2017-06-20 21:04:41 -04:00
bgobandit
078a1e45a6 Lavaland mushrooms and plants can now be cultivated. (#28533) 2017-06-20 20:05:31 -03:00
Jordan Brown
50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus
Sleeping is now a status effect
2017-06-20 16:22:34 -04:00
Jordan Brown
6440a70ec2 Merge pull request #28605 from ChangelingRain/slipfix
Fixes slips
2017-06-20 15:49:45 -04:00
nicbn
482b493e53 removed ligger sticker 2017-06-20 15:08:01 -03:00
AnturK
868d374fab Moves transit space to separate z level. (#28598)
* Transt Z-level

* Just in case

* Map edit

* I guess i forgot to push the few lines i changed at work.

* This one too

* Bluh
2017-06-20 11:31:32 -04:00
Jordan Brown
cc4bd7a0bc Merge pull request #28599 from Xhuis/disabler_inhand_fix
Disablers now have an in-hand sprite (Fixes #28582)
2017-06-20 11:30:45 -04:00
Lan
80380c59e7 Removes loot from Syndicate and Spaceport simple mobs. (#28123)
* Removes loot from Syndicate simple mobs.

* That can go too

* That can go too

* adds del_on_death as remie requested

* added taps to TRUE
2017-06-20 11:12:59 -04:00
Jordan Brown
edca3c06cd Merge pull request #28596 from Xhuis/luxury_capsule_fix
Luxury shelter capsules' display cases no longer spawn offhand objects (Fixes #28589)
2017-06-20 11:11:32 -04:00
kevinz000
d1108df80c [READY] The Portal Update - Linked portals, momentum conservation, and more! (#28055)
* THE PORTAL UPDATE

* portal gun checks

* damn functions

* o_range(s)

* Atmos Portals (#12)

* Rod Form's damage now scales with how much it's upgraded

* buffs chem grenades

* Fix getrev runtime

* Automatic changelog generation for PR #27948 [ci skip]

* Automatic changelog generation for PR #27951 [ci skip]

* Fixes admiral recall (#27861)

* the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978)

* Beam rifles now slowdown while scoped (#27898)

* Update beam_rifle.dm

* Update beam_rifle.dm

* Update beam_rifle.dm

* Fixes a very silly clockwork false wall trick (#27996)

* Fixes #27979 (#28002)

* Automatic changelog generation for PR #28002 [ci skip]

* Fixes #27989 : Riot suits no longer hide jumpsuits (#28003)

* Fixes #27989

* remove tag

* Automatic changelog generation for PR #28003 [ci skip]

* Refactors a cooldown var to not require a spawn or sleep (#28011)

* wat (#28012)

* Remove spawns in favour of stacktrace calls, which don't stop the called (#28013)

proc

* Refactor another spawned cooldown var (#28014)

* Come on, pathetic (#28015)

* Refactor another spawn cooldown (#28016)

* Goodbye spawn (#28017)

* Another spawn timer (#28018)

* Remove a commented out function (#28019)

* Gotta go with the fro2.0 (#28010)

* This doesn't do anything (#28020)

* refactor another spawn cooldown (#28022)

* Refactors another spawn cooldown var (#28023)

* Refactor another spawn (#28024)

* Refactor another spawn var (#28027)

* woops

* woops2

* atmos links!

* unused

* wew

* ffs!

* Forced updates

* update

* Update portals.dm

* adjacent/atmospass checks

* Create portals.dm

* Update portals.dm

* Update other_tools.dm

* stuff

* crossed

* documentation

* reee

* no portal stacking!

* woops
2017-06-20 11:02:01 -04:00
Jordan Brown
4677feda99 Merge pull request #28594 from kevinz000/telecoms_1
Minor telecom code cleanup
2017-06-20 10:30:24 -04:00
kevinz000
d1250a16a1 Bluespace Artillery now requires keycard authentication to unlock controls (#28592)
* kor

* doot

* Update bsa.ract

* Update keycard_authentication.dm

* recompiled
2017-06-20 09:55:23 -04:00
AnturK
72638a14a2 Fixes SM getting energy when hit in space. 2017-06-20 15:46:27 +02:00
Jordan Brown
1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
Jordan Brown
6f1a4e22b0 Merge pull request #28591 from lzimann/whydoweletpeopletouchthecodelikethis
Changes tooltip verbs to be on preferences tab
2017-06-20 09:20:48 -04:00
AnturK
f5e636673b Short-circuiting doesn't work like this. 2017-06-20 11:58:43 +02:00
Jordan Brown
d2b5b45381 Merge pull request #28579 from KorPhaeron/soap
Chisel messages will be below objects
2017-06-19 23:07:12 -04:00
Jordan Brown
0234fede9e Merge pull request #28581 from ChangelingRain/fleshfrombone
Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg
2017-06-19 23:06:38 -04:00
Jordan Brown
c2069e0446 Merge pull request #28583 from Xhuis/equip_delay_framework
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 23:06:07 -04:00
oranges
186d17b77b Refactors hitreaction to pass in the hitting atom
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
nicbn
fce774d7ee Bay-like cryotube pods (#28350)
* Add files via upload

* Add files via upload

* Add files via upload

* Lowered open state glass alpha

* Now cryos have open icon

* and the code is fixed

* oops

* wrong path

* oops2

* Custom sprites for some mobs inside cryo

* More code

* Moar code commit, why not?
2017-06-19 22:42:39 -04:00
Jordan Brown
2328081b25 Merge pull request #28577 from Xhuis/freezer_heater_fix
Freezers and heaters now drop the correct materials (Fixes #28560)
2017-06-19 22:26:29 -04:00
Leo
42dffeed07 Merge pull request #28572 from Xhuis/zombie_revive_message_shrink
Reduces the size of the zombie revival flavor text (Fixes #28568)
2017-06-19 21:52:57 -03:00
Joan Lung
cad788efef Tasers and projectiles stun for the proper amount 2017-06-19 20:43:56 -04:00
Joan Lung
99a5230e62 fix that 2017-06-19 15:43:42 -04:00
Joan Lung
38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
Joan Lung
563f66700c Sleeping is now a status effect 2017-06-19 14:47:35 -04:00
Xhuis
619e53e138 Fixes disablers lacking an inhand sprite 2017-06-19 11:51:19 -04:00
Xhuis
3dac7d1797 Removes offhand objects from fake artifact cases 2017-06-19 11:25:35 -04:00
Xhuis
27c665bfb5 Variable renames, some sets 2017-06-19 11:17:15 -04:00
kevinz000
f37e2a5cc3 reeeeeeeeeeeeeee 2017-06-19 07:52:31 -07:00
Jordan Brown
8d7cdf7596 Merge pull request #28549 from kevinz000/patch-223
Makes gender change potions more noticeable
2017-06-19 09:53:44 -04:00
Jordan Brown
06022a0ba1 Merge pull request #28552 from RandomMarine/lightuplavaland
Bonfires light up in lavaland atmos
2017-06-19 09:53:12 -04:00
Lzimann
50da12ba12 Changes tooltip verbs to be on preferences tab 2017-06-19 09:27:30 -03:00
Xhuis
2a31e44d95 Adds framework for equip delays 2017-06-18 23:24:39 -04:00
Kyle Spier-Swenson
bef4c2c318 Fix cid reconnect message not showing (#28580) 2017-06-18 23:17:45 -04:00
Joan Lung
cc3c809646 Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg 2017-06-18 23:10:25 -04:00
Tacolizard
24f391d943 [READY]Adds examine tooltips (#28407)
* initial

* add preference verb

* forgot to actually make the verb work

* make verb use prefs

* fix and save prefs

* change proc name

* varry good

* will this work?

* ok i think this will work

* halp

* reeee

* fix

* implement remie's suggestions

* fix indentation

* give verb feedback

* change threshold

* mrperson changes

* change threshold

* add custom tooltip delay

* decapitalize process()

* mouseOver = FALSE

* remake delay system

* round force

* fix capitalization

* enable force_string override

* fix force string override

* add TIMER_STOPPABLE flag

* check user

* change operator

* add a comment

* set minimum force to 0

* is this how you do it?

* update savefile

* simplify

* fix savefile

* fix list init

* remove rounding

* change threshhold

* remove colors

* fix

* add spaces

* micro-optimization fnr

* fix permissions

* implement suggestions

* fix permissions

* cyberboss suggestion
2017-06-18 22:57:35 -04:00