Commit Graph

5124 Commits

Author SHA1 Message Date
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
5641bf7983 Merge pull request #18936 from MrStonedOne/patch-222
Fixes charter/War declaration not respecting true round start time.
2016-06-28 00:05:40 +12:00
AnturK
1919e723a7 Merge pull request #18932 from SnipeDragon/cutout-fix
Cardboard Cutouts now become opaque on appearance change.
2016-06-27 10:20:20 +02:00
Joan Lung
afa8ee8058 Merge pull request #18927 from coiax/wrong-turf-charter
Rejecting charter names is now visible
2016-06-26 18:41:19 -04:00
Joan Lung
75106bb789 Hopefully fixes THAT ONE BUG (#18926) 2016-06-26 17:56:55 -04:00
oranges
c4babb8db9 Improves dice tactical combat for deaf 2016-06-26 21:56:39 +00:00
Cheridan
339dfb24a3 Merge pull request #18919 from coiax/big-graffiti-nerf
Changes to large graffiti
2016-06-26 16:09:25 -05:00
Kyle Spier-Swenson
5e2bf79e16 Fixes charter not respecting true round start time. 2016-06-26 04:21:52 -07:00
SnipeDragon
d732607d17 Cardboard Cutouts now become opaque on appearance change. 2016-06-26 00:28:43 -05:00
Jack Edge
a09544992c Merge branch 'master' into shuttle-processing
Conflicts:
	code/modules/shuttle/ripple.dm
2016-06-26 01:00:25 +01:00
Leo
ed71be0970 Implant cases no longer receives implants' flags. 2016-06-25 20:32:03 -03:00
Jack Edge
ba22f1116b Rejecting charter names is now visible
Before it'd make a visual message at the user's location (ie. the admin
that rejected it).

Now it makes a message at the charter's location.
2016-06-26 00:00:26 +01:00
Jack Edge
0d10a1f950 Changes to large graffiti
🆑 coiax
rscdel: Large graffiti now consumes 5 uses from limited use crayons and
spraycans, as well as taking three times the amount of time to draw.
/🆑

- Also fixes bug where clown colorful reagent wasn't being applied to
all three turfs.
2016-06-25 21:54:49 +01:00
Joan Lung
be2466b97c Merge pull request #18889 from coiax/cleanup-2
Code cleanup; silicons, melee, hallucinations
2016-06-25 15:42:49 -04:00
Jack Edge
415d88ddb6 Code review I 2016-06-25 20:26:59 +01:00
Jack Edge
93ed77f8db World timer for toys 2016-06-25 17:59:28 +01:00
Jack Edge
7aef42ae8b spawn() removal on effects_*.dm 2016-06-25 17:50:47 +01:00
Jack Edge
c374782ebf A lot of shuttle changes 2016-06-25 17:28:46 +01:00
oranges
9427c39155 Merge pull request #18872 from ChangelingRain/poolorgib
Pools several unpooled overlay/temp objects
2016-06-25 17:34:30 +12: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
8259247e13 fixes medical holosign 2016-06-23 22:51:16 -04:00
Joan Lung
5a9985674f Merge pull request #18852 from swankcookie/gauze_fix
Changes "Bandage" to "improvised gauze"
2016-06-23 21:05:40 -04:00
Xhuis
16999b6d2b Makes cutouts vulnerable to bullets 2016-06-23 18:18:40 -04:00
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Swankcookie
df25fde271 Changes "Bandage" to "improvised gauze" 2016-06-22 18:36:03 -05:00