Commit Graph

3341 Commits

Author SHA1 Message Date
TheDZD
92ba1ad036 Merge pull request #4621 from Fox-McCloud/hulk-stuffs
Removes Hulk+Double Energy Sword
2016-06-11 12:20:55 -04:00
pinatacolada
3566e6bc91 Defib oversights fixes (#4611)
* Defib oversights fixes

Well, ripping someone's heart out causes them to have a heart attack
right? Well, if you applied a defib to said person before they died from
said heart attack, the heart attack would be stopped, and you would now
have  a heartless living person, spooky right? This prevents that.
Also fixes defibs saying they didn't work when you applied them to
someone with a heart attack, when they in fact did work. And removed a
magic number too.

🆑 pinatacolada
fix: Fixes defibing people without a heart
fix: Fixes defib saying it didn't work stopping a heart attack when they
do
/🆑

* Update defib.dm

* slimespls

* FIXEDIT
2016-06-11 12:19:45 -04:00
TheDZD
a2f2da09b9 Merge pull request #4608 from Fox-McCloud/remove-mindslave
Can Deconvert Mindslaves and Vampire Thralls
2016-06-11 12:11:34 -04:00
TheDZD
d1f017e684 Merge pull request #4595 from FreeStylaLT/HEAD
Adds Mind Batterer, an AOE Crowd Control Traitor-only device.
2016-06-11 12:06:59 -04:00
TheDZD
41386dd748 Merge pull request #4551 from Fox-McCloud/chaplain-things
Ports 3 New Chaplain Weapons
2016-06-11 11:51:11 -04:00
TheDZD
818179ebc3 Merge pull request #4562 from taukausanake/belts
More belt overlays
2016-06-11 11:50:59 -04:00
Fox McCloud
0d627d3213 Merge pull request #4629 from DaveTheHeadcrab/chaplain_stuff
Prayer Bead Fix
2016-06-09 23:49:21 -04:00
SamCroswell
3664fe6b7f Quick Fix 2016-06-09 21:52:44 -04:00
Fox McCloud
7f099b4b75 Merge pull request #4625 from Krausus/PoliceTapeBumpFix
Fixes Tape Moving Mobs Recklessly
2016-06-09 03:50:46 -04:00
Fox-McCloud
e6801a98e3 fixes and tweaks 2016-06-09 03:19:27 -04:00
Fox-McCloud
9f6dd7485d Merge remote-tracking branch 'upstream/master' into chaplain-things 2016-06-09 01:05:43 -04:00
Krausus
3c7ab29e2e Fixes police tape moving mobs recklessly 2016-06-09 01:01:03 -04:00
SamCroswell
18260bff66 Prayer Beads - Merge Conflict Fix (For real this time) 2016-06-08 23:32:18 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again
Major Gun Refactor
2016-06-08 22:49:10 -04:00
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss
Experimentor Duplication Limit
2016-06-08 11:15:18 -04:00
Fox-McCloud
f74db988e2 Removes Hulk+Double Energy Sword 2016-06-08 02:44:41 -04:00
SamCroswell
509752f678 Spelling Fix 2016-06-07 21:59:35 -04:00
FreeStylaLT
2febf8ae60 Reduced range to not affect off-screen dudes and dudettes 2016-06-07 15:07:10 +03:00
FreeStylaLT
692aa38d4e Changed from orange to oview 2016-06-07 14:46:20 +03:00
Fox-McCloud
bb02bfa284 Experimentor Duplication Limit 2016-06-07 02:25:06 -04:00
TheDZD
a7d0cfd09c Merge pull request #4597 from Fox-McCloud/progress-fixes
Fixes Construction Progress Bars
2016-06-06 22:10:25 -04:00
Fox-McCloud
eb653a68c8 Can Deconvert Mindslaves 2016-06-06 10:32:57 -04:00
Fox McCloud
cad0d7ba3a Merge pull request #4607 from monster860/rnd_fix
Fix some origin_tech s
2016-06-06 07:17:54 -04:00
monster860
14a6a575a9 Fix some origin_tech's 2016-06-06 05:47:10 -04:00
SamCroswell
106743163e Prayer Beads - Fixes
The wait time is now appropriate.
Ensures you can only do one prayer at a time.
Changes messages to reflect if you're praying for yourself.
2016-06-05 17:31:02 -04:00
SamCroswell
04c7c4f843 Prayer Beads - Adds Item 2016-06-05 17:07:40 -04:00
FreeStylaLT
aa63118f9a Buffed the uses to 5, made the stun 80% of a baton to 140% of a baton. Added additional info on examine/use. 2016-06-05 16:40:36 +03:00
Fox-McCloud
5db40a08c7 Fixes Construction Progress Bars 2016-06-04 23:12:23 -04:00
FreeStylaLT
665dbc04e1 you motherfucker 2016-06-05 00:59:24 +03:00
FreeStylaLT
6b099db7a4 how does tiger see this shit 2016-06-05 00:52:03 +03:00
FreeStylaLT
42ddf3e8c9 Adds Mind Batterer, an AOE Crowd Control Traitor-only device. 2016-06-05 00:14:07 +03:00
pinatacolada
4dfbd113bc command soap books
just adds one to the blueshield's, nt rep's, IAA, captain's, and HoP's
offices. das all

🆑 pinatacolada
rscadd:Adds Command SOP books
/🆑
2016-06-04 15:49:49 +01:00
taukausanake
adc5d46920 Final push, magic belt done
This should be everything finished now. Made sprites for the wand belt and animated them too! Sprites for wand of fireball, polymorph, death, resurrection, teleportation, door creation, and nothing because it's also a wand. Also made a sprite for a single soul stone for the soul stone belt. Didn't feel it needed the same treatment as the bandolier.
The only thing that might not be accepted in this commit is that I commented out the syringe and beaker for the botany belt. They clash with the belt as it is but my argument is that they aren't even used in Hydroponics anymore anyways. At the very most you'll use them for the reagents you grow but chances are you won't put them in your belt anyways.
2016-06-03 21:52:25 -05:00
TheDZD
f17f4ccdeb Crossbows and piescannons 2016-06-02 22:17:19 -04:00
TheDZD
5c6ff25777 Merge pull request #4571 from Fox-McCloud/nullrod-fix
Fixes Nullrod Equipping
2016-06-02 20:54:45 -04:00
Fox-McCloud
99c51031f5 Fixes Nullrod Equipping 2016-06-02 20:46:49 -04:00
TheDZD
6d1aad7adc Merge pull request #4569 from Tastyfish/cable-color
Makes stacks even better
2016-06-02 20:06:39 -04:00
Tastyfish
0c465c9531 Makes stacks even better 2016-06-02 19:02:02 -04:00
Fox McCloud
962002b3c9 Merge pull request #4560 from Tastyfish/item-action-button-fix
Fixes holsters and potentially other accessories's action buttons
2016-06-02 18:57:56 -04:00
Fox McCloud
86060d215a Merge pull request #4568 from Tastyfish/cable-color
Fixes splitting cable coils off inactive hand not having correct color
2016-06-02 18:57:36 -04:00
Tastyfish
6d99fdedf3 Fixes splitting cable coils off inactive hand not having correct color 2016-06-02 17:08:47 -04:00
taukausanake
8a717bf0e3 More belt overlays
I posted in PR #4548 that I'd like to try and make the other belt overlays. Here is my contribution!

Progress
- [x] Bandolier
- [x] Botany belt
- [ ] Utility belt
- [ ] Medical belt
- [ ] Janitor belt
- [ ] Holtser(?)
- [ ] Soulstone belt(?)

Bandolier works the same as the lazarus "trainer's belt". I had to remove the bottom shell pixels so that it actually held eight instead of nine shells.

Botany belt shows icons for plant analyzer, mini hoe, spade, hatchet, and wirecutters. Wirecutters will be shared with botany belt and utility belt.
2016-06-02 00:09:43 -05:00
Tastyfish
57abc28c73 Fixes holsters and potentially other accessories with action buttons 2016-06-01 20:30:57 -04:00
TheDZD
8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
TheDZD
95d7a68a75 Here we go again... 2016-05-31 22:50:53 -04:00
Fox-McCloud
1b830fcd1f fix 2016-05-31 22:41:07 -04:00
Fox-McCloud
bc7cee537f Ports 3 New Chaplain Weapons 2016-05-31 22:15:41 -04:00
SamCroswell
82f037d946 SecBelts 2016-05-31 17:42:14 -04:00
Fox McCloud
579e438137 Merge pull request #4537 from monster860/guest_pass
Adds some new guest pass features
2016-05-30 22:55:04 -04:00