Commit Graph

16993 Commits

Author SHA1 Message Date
Cheridan
2bb568bf2b Adds an aesthetic new space ruin with original content (hi bawhoppen) (#19275)
* Adds an aesthetic new space ruin with original content (hi bawhoppen)

* do you understand its all in your hands its your move

* i made up my mind
time is running out
2016-07-14 14:21:49 -04:00
Cheridan
f457b572d6 Merge pull request #19305 from ChangelingRain/dexterityissues
Fixes some dexterous guardian issues
2016-07-14 12:22:12 -05:00
bawhoppen
7830992c11 Makes shuttles superficially buildable (#18974)
Added two new materials, Titanium and plastitanium. Titanium is naturally occuring, and plastitanium is an alloy made of plasma and titanium.
These materials can be used to build shuttle walls and floors, though this serves no current purpose.

Before you yell "SNOWFLAKE" about the materials, I have definite planned purposes for them, not to mention what else they could be potentially used for (mechs, R&D, etc.)
You can use titanium to make white shuttle walls that smooth (like the ones of the escape shuttle), and plastitanium to make the grey syndie shuttle walls. You can also make floor tiles out of each material for the different shuttle floors. This PR itself doesn't change any of the paths on the map to use smoothed shuttlewalls and I'll save that for a seperate PR.

Also this PR makes ORM code better and allows people to easily add new alloys

Sprites by WJ
2016-07-14 21:25:49 +12:00
oranges
14f425881e Merge pull request #19309 from KorPhaeron/Ihavenopatience
Shortens shuttle travel time from 25 to 6 seconds
2016-07-14 19:42:26 +12:00
lordpidey
810f3d9052 Small devil fixes (#19302)
* Removes errant cast from devilinfo.add_soul()

* Clarifies a banishment ritual in the Codex Gigas.

Sprinkling holy water isn't enough, it needs to be in the devil's bloodstream.

* Infernal jaunt now correctly extinguishes the user.
Revival contracts no longer actually set the target on fire, but rather uses a fake fire.

* Pitchforks don't burn devils or soulless on use/pickup anymore.
Adds cast charge time to infernal jaunt, so that it's impossible to jaunt while already jaunting.
Adds feedback to using infernal jaunt to jaunt in.
2016-07-14 19:41:01 +12:00
oranges
e19369280d Merge pull request #19290 from lzimann/altclickjumpsuits
Alt clicking now removes jumpsuit accessories.
2016-07-14 19:38:50 +12:00
Core0verload
e666d2e76b ports pockets (from Animus Green) and adds them to some clothing.
This PR ports pockets (from Animus Green) and adds them to some clothing.

 Shoes that support storing items now use pockets system.
 Some hats have 1 small pocket.
 Detective's hat spawns with a flask in it.
 Clown's mask has a single tiny top-secret pocket. Honk!

This PR also includes two or three path fixes. It also fixes internal storages (pockets, storage implant) having less "max depth" than external ones.
2016-07-14 19:36:26 +12:00
KorPhaeron
251b2dc372 Shortens shuttle time from 25 to 6 seconds 2016-07-13 21:20:30 -05:00
oranges
90340ca794 Merge pull request #19306 from MrStonedOne/511compilefix
fixes compiling under 511
2016-07-14 09:25:52 +12:00
MrStonedOne
80044c3380 fixes compiling under 511 2016-07-13 14:09:37 -07:00
AnturK
1eba595115 Fixes create antagonist for revenants. (#19296) 2016-07-13 13:16:13 -04:00
Joan Lung
243374eec6 Fixes some dexterous guardian issues 2016-07-13 11:51:25 -04:00
AnturK
632ef1bd57 Merge pull request #19289 from lzimann/nerfthemedals
Medals are no longer instant to pin
2016-07-13 14:54:09 +02:00
oranges
ba163eb417 Merge pull request #19286 from coiax/ai-fxes
Fixes an AI with a deleted camera being stuck
2016-07-13 18:46:46 +12:00
oranges
012c163356 Merge pull request #19281 from Cruix/plasma_sheets_are_not_reagent_containers
Fixed a runtime when gibbing plasmamen in the gibber.
2016-07-13 18:43:52 +12:00
TechnoAlchemist
f8e54b25ba Makes lethal injection actually lethal. (#19278)
* Makes lethal injection actually lethal.

* Spacing
2016-07-13 18:19:10 +12:00
AnturK
523a2b29fe Implant chair refactor (#19272)
Removes some copypasta
Refactors implant chairs. Adds some fun variations.
2016-07-13 12:59:06 +12:00
Joan Lung
71da2aba13 Fixes shuttles killing AI camera eyes (#19280)
* this wasn't even my bug but because mso was an ass I fixed it for him

* spitefronds
2016-07-13 12:50:20 +12:00
Xhuis
82e2e8a844 Pinpointer refactor (#19156)
* Pinpointer refactor

* Gives operatives the proper pinpointers

* Improves operative and AI tracking a bit

* Bashing people over minor mistakes is the new thing

* Replaces some more strings with defines

* Makes operative tracking actually functional

* Improves operative tracking

* Conflicts I

* Conflicts III

* Conflicts I

* Conflicts III

* Adds two new tracking modes

* Fixes a grammar error
2016-07-13 12:03:36 +12:00
Militaires
596b42d5dc Adds a new hairstyle (#19265)
* bitches leave

* cops dont like me so i dont like cops

* alright fun's over
2016-07-13 12:01:22 +12:00
Shadowlight213
b4b21842db Sending adminpms from IRC. (#19097)
* Sending adminpms from IRC.

* added limit of 2 messages sent to irc per irc message recieved.
2016-07-13 11:40:18 +12:00
Joan Lung
fe28096320 Adds dextrous guardian (#19254)
Added dextrous guardians to the code, able to hold and use items and store a single item within themselves.

Dextrous guardians do low damage on punches, have medium damage resist, and recalling or leashing will force them to drop any items in their hands.
2016-07-13 11:25:00 +12:00
Fox McCloud
2a10bbf4bc Fixes Borg Stun Attack and Simple Animal Armor Penetration (#19269) 2016-07-12 16:00:35 -04:00
Lzimann
16295889d7 Remove accessory is no longer a verb, moved it to alt click. 2016-07-12 10:51:26 -03:00
Lzimann
e1c1f0a99f Adds the missing comma 2016-07-12 10:31:29 -03:00
Lzimann
9beea968f2 Medals are no longer instant to pin 2016-07-12 10:16:05 -03:00
Jack Edge
a7d33d73ec Fixes an AI with a deleted camera being stuck
For example #19279 will cause the roadkill to (incorrectly) kill the
AI's camera mob. Now the AI Life() tick will correctly recognise a dead
camera, and recreate it.

- Also fixes a bug where a hacking-in-progress APC getting its AI
control wire cut would make a message, and then another message when the
timer finished.
- Removed trailing returns, addtimer'd a thing
2016-07-12 13:21:40 +01:00
oranges
70b080cb00 Merge pull request #19261 from hornygranny/an_arm_and_a_leg
fixes attacks missing due to dismemberment
2016-07-12 14:49:41 +12:00
unknown
ea070a4680 Fixed a runtime when gibbing plasmamen in the gibber.
Renamed generic skin to skin.
2016-07-11 21:52:47 -04:00
Remie Richards
ae43c4908b Fixes some Alternate Appearance issues (#19258)
Fixes Alternate Appearances clobbering each other
Fixes Viewed Alternate Appearances not being cleared out during an atom's Destroy()
Fixes Kor's AA plants.
properly removes viewing_alternate_appearances AAs
2016-07-12 10:07:49 +12:00
MMMiracles
4f18303695 hotel changes (#19257)
Fixed locker access. Some slight visual changes to turfs as well as a small theatre-ish stage to the open bar/kitchen area. The front desk now has pamphlets to give to arriving guests as a short description of the place they just teleported to.

Also, all hotel staff now spawn in with mindshield implants (vigorous background checks to ensure any subconscious bloodlust urges are contained), as well as the energy shotgun being given a mindshield pin due to complaints about some people bumrushing the hotel for it.
2016-07-12 10:05:15 +12:00
TechnoAlchemist
8d0cac8e01 Gives slime potions unique sprites. (#19256) 2016-07-11 17:19:21 -04:00
Firecage
da3da71e29 Misc Botany changes. (#19240)
* Names the cannibas leaves and enables weapon/grown to be added to the smart fridge

* Gives cannabis seed packets sprites consistent with other seed packets, and so they also look different.
2016-07-11 19:11:54 +12:00
coiax
771c64084d Shuttle SS keeps track of hostile environments (#19235)
* Shuttle SS keeps track of hostile environments

Instead of changing SSshuttle.emergencyNoEscape manually, datums now
register and clear themselves with the SS, and a hostile environment is
if any datums are registered.

Note that it's datums that can be registered, as rev and blob gamemodes
register themselves.

Overhauling this means that you can have multiple sources of no-recall,
which although can't happen at present, may do so in the future whenever
multi-antag rounds happen.

🆑 coiax
tweak: The AI doomsday device timer is more accurate.
fix: Fixes a bug where the doomsday device would take twice as long as
it should.
/🆑

AI doomsday timer uses world.time, uses fastprocess to make sure the
announcements go out on time, added observer countdown for
the AI doomsday device.

* Fixes bugs
2016-07-11 16:53:23 +12:00
hornygranny
14ecd90f2a fixes attacks missing due to dismemberment 2016-07-10 16:44:46 -07:00
oranges
f1ec974c08 Merge pull request #19224 from Iamgoofball/patch-69
Mistake made due to lack of understanding of stun code
2016-07-11 08:59:58 +12:00
oranges
1f82eda6dc Merge pull request #19223 from Cruix/more_fixes
Fixes drone runtime and security records consoles.
2016-07-11 08:59:15 +12:00
Cheridan
2f2bb8cbd3 Merge pull request #19218 from coiax/syndicate-bomb-in-the-bar
Syndicate bombs use world.time; explode faster
2016-07-10 09:59:19 -05:00
Cheridan
3855216314 Merge pull request #19220 from MrStonedOne/patch-228
makes some atmos procs have the right pathing
2016-07-10 09:56:57 -05:00
Iamgoofball
3e349b75ea Fixes Omega Weed (#19229)
* Fixes Omega Weed

well i put an extra 0 in there

* I told you it was reasonable oranges
2016-07-09 21:38:19 -04:00
AnturK
45b75017bd Merge pull request #19217 from Firecage/Bloodlessholodeck
Fixes holodeck animals bleeding.
2016-07-09 15:23:49 +02:00
Joan Lung
26a5ec3ea3 Merge pull request #19188 from coiax/changeling-regeneration
Changling power: regenerate; regrow limbs, organs
2016-07-09 08:40:27 -04:00
Joan Lung
88324510ed Merge pull request #19149 from coiax/turn-both-keys
Nuclear bombs use TGUI and world.time
2016-07-09 08:39:03 -04:00
Joan Lung
9323f7e9de Merge pull request #19207 from coiax/set-at-own-risk
Added (SETCODE) button for nuclear code request
2016-07-09 08:37:59 -04:00
Jack Edge
a75b7b7830 Merge branch 'master' into turn-both-keys
Conflicts:
	tgui/assets/tgui.js
2016-07-09 12:22:03 +01:00
oranges
0aff724b57 Merge pull request #19194 from Crazylemon64/maploader_multiload
Prevents the maploader from resetting when another map is read
2016-07-09 18:19:39 +12:00
oranges
2b8fe78ca6 Merge pull request #19193 from Core0verload/rtg
Radioisotope Thermoelectric Generators
2016-07-09 18:19:28 +12:00
Kyle Spier-Swenson
83e4404f7b Planetary atmos (#19189)
* Planetary atmos
Turfs marked as planetary_atmos will revert back to their default state as if the upper atmosphere mixes with it reverting it.

* Fixes Planetary Atmos being treated as space.
2016-07-09 18:18:31 +12:00
Core0verload
9edf034fa9 Changes a bit how hardsuit jetpack upgrade works (#19165)
Hardsuit jetpack upgrade item is replaced by an actual jetpack - the same as the one that exists inside the upgraded suit. It still can't be used separately.

Hardsuit jetpack has hardsuit jetpack sprites instead of voidsuit pack.

You can remove jetpack from hardsuit by using screwdriver on it.

Unrelated:
Fixes mining vendor UI a bit: items with long names no longer take two lines.
Changes staff of storms path to actual staff.
2016-07-09 18:17:43 +12:00
coiax
4c5e478ed6 Observers can auto-orbit meteors; space dust event (#19142)
* Observers can auto-orbit meteors; space dust event

During a meteor shower, observers can automatically orbit
threatening meteors and watch them hit the station.

Added Major Space Dust event, which is a meteor shower
containing only space dust.

Reduced chance of RNG meteor event.

Fixes bug where meteors wouldn't move when spawned.
2016-07-09 18:16:11 +12:00