Commit Graph

21539 Commits

Author SHA1 Message Date
Leo
f754700a33 Merge pull request #28686 from optimumtact/assessthread
Refactors threat assessment for security bots
2017-06-24 16:50:46 -03:00
KorPhaeron
f9e5cb1460 Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit (#28708) 2017-06-24 16:48:28 -03:00
AnturK
1d4820d9cc Fixes whiteship escape (#28734) 2017-06-24 13:48:39 -03:00
Joan Lung
39b33f9de9 Merge pull request #28697 from Jordie0608/whyarethepolltypesdefinesthatseemskindasilly
Server polls create only when done being made
2017-06-23 16:50:29 -04:00
Really-Good-Soda-Flavor
e48df5338c [READY] New holidays including Thanksgiving and Ramadan (#28054)
* New holidays and weekday helper

* Got rid of var/

* Added separate Thanksgivings and removed an indentation on Tuesday

* Makes Mother's Day less ambiguous.

* Adds Ramadan heck yea

* Gives Ramadan a fixer-upper so it is accurate for a good while
2017-06-23 16:24:28 -04:00
Jordan Brown
37e00d62bd Merge pull request #28716 from lzimann/offhand
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once
2017-06-23 15:07:37 -04:00
kevinz000
13ec788a50 fixes wormhole jaunters (#28706)
* Update wormhole_jaunter.dm

* Don't feel like waiting for @kevinz000 to do this
2017-06-23 15:01:36 -04:00
Jordan Brown
06c22a1e40 Merge pull request #28714 from ChangelingRain/crusherlighting
Fixes the kinetic crusher not emitting light
2017-06-23 14:49:13 -04:00
Ashe Higgs
2c047bd4c7 Intercoms are now constructable (#28659)
* Intercoms are now constructable

* l a t h e

* replaces on_wall with pixel_shift

* does the thing

* Adds an additional construction step
2017-06-23 14:39:43 -04:00
Expletive
814d34d953 Adds the skull codpiece, an accessory that can be worn above or below an exosuit. (#28479)
* Adds the skull codpiece, an accessory that can be worn above or below an exosuit.

* woops
2017-06-23 14:33:17 -04:00
Joan Lung
deae811756 Unconscious and Knockdown are now status effects (#28696)
* Unconscious and Knockdown are now status effects

* Fixes #28628

* fixes borgs

* the terrifying second argument

* Much better
2017-06-23 12:00:49 -04:00
Joan Lung
06f2b4f45e Fixes some wizard stuns (#28693) 2017-06-23 07:47:21 -04:00
Leo
9d45a6db23 Merge pull request #28670 from MrStonedOne/fixcidrandomizer
Makes oldchat show while goonchat loads, sends preload messages there.
2017-06-22 21:49:41 -03:00
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
Lzimann
88816aae12 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being
qdelled many times.
2017-06-22 16:32:24 -03:00
Joan Lung
fdbfe9bd9d Fixes the kinetic crusher not emitting light 2017-06-22 15:10:06 -04:00
nicbn
77a2d3f5cd Replaces "istype"s with is_helpers macros (#28676) 2017-06-22 15:03:19 -03:00
Leo
b0128b17d1 Merge pull request #28665 from ShizCalev/papyrus
Fixes spriteless empty paperbins
2017-06-22 12:58:00 -03:00
Jordie0608
9c0eff8d5e makes it all work 2017-06-22 22:04:05 +10:00
Jordie
e4fc888559 Merge branch 'master' into whyarethepolltypesdefinesthatseemskindasilly 2017-06-22 12:36:33 +10:00
Jordie
07b125cb35 no options for text reply polls 2017-06-22 12:27:39 +10:00
Jordie
aefa0cdee4 polls now only sent to db when done being made 2017-06-22 12:13:43 +10:00
Joan Lung
58c054acb5 Stun is now a status effect (#28654)
* Stun is now a status effect

* I'D RATHER NOT

* smart

* very smart

* pideyview

* small fixes

* slight fix
2017-06-22 10:50:46 +10: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
MrStonedOne
7a13937fc7 Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-21 00:51:28 -07:00
shizcalev
df75d76c7e fix
fixes #28653
2017-06-21 00:12:31 -04: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