Commit Graph

3368 Commits

Author SHA1 Message Date
oranges
8c9f2a7eff Merge pull request #19318 from DaveTheHeadcrab/plastic_explosives
Resolves a runtime with X4
2016-07-16 12:02:49 +12:00
SamCroswell
5772735d0e X-4 Bugfix 2016-07-14 15:42:15 -04:00
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
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
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
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
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
Iamgoofball
f3a41adfac Do you expect me to talk? (#19192)
No, Chaplain, I expect you to die.
2016-07-09 18:19:11 +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
afb7ebd790 Tiles are now (mostly) pooled objects (#19112)
* Tiles are now (mostly) pooled objects

Floors no longer have a builtin_tile, but instead use PoolOrNew().

Also added a do-nothing SSpool so you can inspect the global pool.

* Entries for time keeping

* MORE STATISTICS

* Stat tracking, auto filling

* Code review I

* Code review II

* Code review III
2016-07-08 13:32:40 -04:00
Leo
57ff27f4a9 Adds a craftable baseball bat (#19144)
The baseball bat has 10 force, although it throws the person back one or two tiles.

Sprites by Keekenox

In-hand sprites:
2016-07-08 09:56:39 +12:00
Jack Edge
fecaf91e0e Burnt matches can no longer ignite paper or people
Fixes #19162.
2016-07-06 13:25:19 +01:00
coiax
3796656340 Adds ammo drops to CTF, fixes reload bug (#19125)
* My bed broke

* Slow healing, nodrop items

* Mark arena as dirty when stopping ctf

* Fixes spooky zombie projectile bug
2016-07-06 07:53:30 -04:00
MMMiracles
e86c4de075 haha testing features xd (#19138) 2016-07-05 20:12:05 -04:00
coiax
6449b65d30 Adds fireplaces, eswords are hot, cardboard is flammable (#19118)
Makes needed improvements to proposed fireplaces

- Fireplaces now use world.timer
- Fireplaces no longer prompt input() for inserting logs, it just
takes as many logs as possible
- Paper and paper bins can be thrown on the fire, thirty paper is worth
one log of burn time.
- One log gives 15 seconds of burn time, the fireplace can hold up to 5
minutes of fuel.
- Ignitable items now use a /obj level proc to generate their messages,
currently using this are cigarettes, candles, fireplaces
- The fireplace can be put out with an extinguisher
- Cardboard cutouts are now flammable
- The fireplace is only "warm and cozy" when lit
- Paperbins qdel their stored papers when destroyed (probably did that
already, but no harm in making sure)
- Also removed some returns hanging around

* Added new proc for lighting stuff

- Adds ignition_effect(atom/A, mob/user) to obj/item, which is called
when you're attempting to light things with that object. By default it
does nothing and prevents ignition, but if the object is hot, it returns
a message. May do other things for different stuff.

- Eswords now ignite flammable gasses in their area.

* Fireplace is no longer on fire when not on fire
2016-07-06 10:16:47 +12:00
hornygranny
051e532337 Makes the fedora holy weapon sharp and actually good (#19116)
Gives the chaplain fedora a sharp flag and some force
2016-07-06 10:15:01 +12:00
unknown
225f2550c4 Fixed vending machine restocking units not working. 2016-07-03 23:09:25 -04:00
Leo
dfac096b52 Throwing an active stunbaton now has a chance to stun people! (#19083)
* Tactical stunbatons

* Throw impact don't use 'usr' anymore.

* The probability is now a var and stunprods have way lower chance

* Perfect balance
2016-07-03 18:53:11 -04:00
AnturK
02bdb52704 Merge pull request #19066 from Cruix/misc_fixes
Misc fixes
2016-07-03 13:41:19 +02:00
MMMiracles
706a4f344b Adds the Power Fist (#19013)
The power-fist is a semi-port of hippiestation's power-fist. Sprites are from hippiestation.

The power fist is a metallic gauntlet with a built-in piston-ram that uses an external tank as its gas source. A wrench can be used to dial up the piston's valve and make the gauntlet hit harder and farther in exchange for more gas used.

A full large-tank will get exactly 4 level-3 punches in before needing to replace the external tank. This thing is incredibly lethal for taking out singular targets at a time but very poor against crowds as odds are you're going to exhaust your supply before fending off everyone.

The TC price might be too low/high, I don't know yet until people play around with it in an actual round. All I know is punching pun-pun half-way down the escape hall in a single hit is fun.
2016-07-02 14:40:22 +12:00
unknown
6491bcd5f1 Fixed hand labelers being unable to label storage items.
Fixed being unable to resist out of wrapped lockers.
Fixed being unable to resist out of lockers inside morgues.
Fixed mechs being able to spam doors they do not have access to.
2016-07-01 20:32:32 -04:00
TechnoAlchemist
4c8f22f1de Adds energy bolas to the secvend. (#19006)
Refactors the code slightly as well
2016-07-01 20:01:01 +12:00
oranges
47839f07be Merge pull request #19009 from bobdobbington/make_tgstation_great_again
Adds skub to the AutoDrobe as a premium item
2016-06-30 16:39:57 +12:00
Cheridan
9c0e97cc86 Merge pull request #18997 from ChangelingRain/slipnslide
Wetting turfs should actually last for some time
2016-06-29 22:41:24 -05:00
oranges
d47bfcefe6 Merge pull request #18931 from lzimann/patch-8
Fixes implant cases being deleted on drop
2016-06-29 15:48:00 +12:00
bobdobbington
5fca5a3120 Merge branch 'master' into make_tgstation_great_again 2016-06-28 17:30:39 -07:00
bobdobbington
e8ce9b55bd Adds skub to the Autodrobe as a premium item 2016-06-28 17:23:38 -07:00
Joan Lung
8516999a2a Wetting turfs should actually last for some time 2016-06-28 14:28:51 -04:00
AnturK
5884c14fef Merge pull request #18947 from optimumtact/hearing
Improves dice tactical combat for deaf
2016-06-28 12:13:28 +02:00
bgobandit
10d32cd9d4 Fixes/tweaks a lot of typos/descriptions. (#18956) 2016-06-28 22:02:28 +12:00
Core0verload
e78451796f Mining tweaks, fixes and balance changes (#18697)
Tweaks and QoL changes:
    Kinetic accelerator now supports seclite attachment.
    Miners now have a special heavy duty headset, it differs from regular supply headset only in sprite.
    Miner's roundstart crowbar now spawns in box instead of backpack.
    Preserved legion core no longer sparks and has a telling desc.

Balance changes:
    All cyborgs are now ash-proof. Mining cyborg starts with ash-proof sprite to fit dark mining style. All borgs are superior to humans at their module's job, it makes sense for mining cyborg to come with ash-proof hull by default - after all, mining borgs can't deploy shelters to sit out ash storms.
    Ash-proof plating upgrade was replaced with Lavaproof tracks. This upgrade allows mining cyborgs to roam lava safely.
    Mining cyborg module now includes a tiny welding tool for basic self-repair. This welding tool holds 4 times less fuel than the one used by engineering cyborgs. It also includes a small fire extinguisher.
    Miners start with a box of 3 brute and 1 burn paths instead of a single brute patch. This compensates for recent path nerf that dropped amount of reagents in single path more than in two.
    Explorer's belt slot amount is increased by one, while mining belt crafted from sinew still has 5 slots.

Fixes:
    Updates miner's corpse and mining wardrobe with new lavaland gear.
    Fixes envy's knife path.
    Fixes wing potion's misguided racism.
    Fixes #18796. Fixes legion's nullspace corpse drop bug and two related runtimes.
2016-06-28 21:58:57 +12:00
Xhuis
8a852f196b Removes shadowling (#18951) 2016-06-27 20:53:35 -04:00
TechnoAlchemist
68c187485c Red orb flavor change. (#18857)
* Not for honor, but for kor.

* adds sound/misc/d_e1m1.mid

* Adds the correct file.

* mama never did forgive him

* Kor's Changes

* More changes

* Hopefully compiles

* >>>1
2016-06-27 17:39:09 -04:00
Leo
4b90c45b2a Chem implantcase attackby now checks for implant 2016-06-27 12:23:14 -03:00
oranges
c4babb8db9 Improves dice tactical combat for deaf 2016-06-26 21:56:39 +00:00
Leo
ed71be0970 Implant cases no longer receives implants' flags. 2016-06-25 20:32:03 -03:00
Jack Edge
415d88ddb6 Code review I 2016-06-25 20:26:59 +01:00
Jack Edge
67a5079598 Compile fixes I 2016-06-24 14:13:02 +01:00
Jack Edge
a841bd14f5 Code cleanup; silicons, melee, hallucinations
- Cleaned up paint.dm
- Everything else should be self explanatory
- Removed braindamage part of esword, since you can't reach that; it
  would be handled by attack_self()
2016-06-24 14:03:44 +01:00
oranges
41e3acc71d Merge pull request #18820 from Xhuis/the_pinnacle_of_deception_technology
Adds cardboard cutouts
2016-06-24 20:14:59 +12:00
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Xhuis
369ad867de Adds cardboard cutouts 2016-06-21 17:57:53 -04:00
oranges
3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3
Remove spawn III
2016-06-21 20:11:08 +12:00
PKPenguin321
01d4d02b70 conflicts + undo loc changes
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
2016-06-20 22:22:50 -07:00
Kyle Spier-Swenson
0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
oranges
bce99c4f58 Merge pull request #18668 from coiax/dropdel
Adds DROPDEL flag; items will qdel() on dropped()
2016-06-20 11:08:31 +12:00
oranges
448e386ac4 Merge pull request #18649 from Xhuis/my_eyes_have_seen_that_which_cannot_be_comprehended
Reagent tank optimization
2016-06-20 08:18:33 +12:00
oranges
7dc92e3f98 Merge pull request #18647 from TechnoAlchemisto/I_was_lucky_if_papa_went_for_me_first_because_then_at_least_I_would_be_too_disoriented_to_realize_what_he_was_doing_to_sis
Adds hard cider to the bar.
2016-06-20 08:18:05 +12:00
Joan Lung
b941a47a60 Adds cogscarabs to clock cult (#18685)
* Adds cogscarabs to clock cult

* playstyle string

* info

* oh good going

* no static

* delay it eating all the metal

* scarab removal service

* cog

* ree

* error handling

* todo: languages = RATVAR

* isclockmob

* very large box

* faintly glowing eyes
2016-06-19 17:26:35 +02:00
WJohn
55428bb8ad Merge pull request #18593 from pudl/cool-carpet
Re-implements old carpet sprite
2016-06-19 08:20:02 -04:00