Commit Graph

21888 Commits

Author SHA1 Message Date
VampyrBytes
ffc01b6ac2 improves command setting
thanks @Krausus
2016-06-15 18:56:08 +01:00
VampyrBytes
7979706c5a strips out old emote code 2016-06-14 09:03:39 +01:00
VampyrBytes
5213682c42 adds buzz2 (#4561)
adds buzz2, with target and access for simple_animal/bot
2016-06-13 19:51:40 +01:00
VampyrBytes
15ef6c7f46 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2 2016-06-13 18:27:01 +01:00
VampyrBytes
7187a5e8e5 Bugfixes 2016-06-13 18:12:05 +01:00
TheDZD
01f0738e11 Fixes camera assemblies and orange shoes not respecting NODROP (#4654)
* Fixes camera assemblies not respecting NODROP

* Shoes fix
2016-06-13 01:39:26 -04:00
TheDZD
cf2e294f7c Merge pull request #4645 from LittleBigKid2000/literallyunplayable
Fixes the charcoal suit's description
2016-06-12 11:05:58 -04:00
Isaac Erwin
8c37ba7ba1 Fixes the charcoal suit's description
The tie is blue, not red. Literally unplayable.
2016-06-12 04:05:16 -04:00
Fox-McCloud
b2040467bd Fixes Databaseless Operation Runtime 2016-06-12 03:53:26 -04:00
Tom Heeren
4e31600491 Gives synthetics a more irritated buzz noise. (#4561)
* Adds the ability to make the sad trombone noise for synthetics.

Also moves the sound file itself into the sound/machines folder.

* No wait I can't do that

Moves the sadtrombone noise back to where it came from.

* Changes the sad trombone to buzz-two

Do I win a prize
2016-06-12 02:30:49 -04:00
monster860
42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -04:00
TheDZD
ad0b8fea29 Merge pull request #4619 from Fox-McCloud/grab-fixup
Grab Fixes and Throwing Refactor
2016-06-11 12:29:31 -04:00
Twinmold93
bf2d74d80e Spacepod Fix - Equipment Modules (#4637)
* Spacepod Fix - Equipment Modules

Changes the installed_module variable in equipment to a list, allowing
the rest of the code to read it correctly.  Now when equipment is added
and removed from the pod, it updates properly. Also adds any equipment
the pod starts with to the list.

Fixes the issues in:
https://github.com/ParadiseSS13/Paradise/issues/4599

* Changes List Call

Changes:
equipment_system.installed_modules = new/list()
to
equipment_system.installed_modules = list()

* Properly Placement for List Defined

Removes the definition of the variable as list() from spacepod.dm to
equipment.dm, clearing up a little of size from the total code.

* Removes shot_from

Removes the shot_from lines from the code.
2016-06-11 12:22:34 -04:00
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
062f14284e Merge pull request #4547 from CrAzYPiLoT-SS13/cupcakesnchainsaws
Adds a check for twohanded items to cuffing
2016-06-11 12:11:49 -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
TheDZD
de7bf10447 Merge pull request #4620 from Fox-McCloud/mai-tables
Nerfs Tabling
2016-06-11 11:47:20 -04:00
DaveTheHeadcrab
128bb4deb1 Fluff Item Adjustments (#4630)
* scanner icon

* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Fluff Item Tweaks

* Removes the stat check

* Windbreaker Starts Open
2016-06-10 00:29:51 -04:00
Fox McCloud
62af26fa16 Merge pull request #4623 from DaveTheHeadcrab/detective_stuff
Detective Scanner Update
2016-06-09 23:59:00 -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
FreeStylaLT
235da61ced typos 2016-06-08 23:44:17 +03:00
TheDZD
c6b4539548 Finishing touches 2016-06-08 15:11:24 -04:00
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss
Experimentor Duplication Limit
2016-06-08 11:15:18 -04:00
SamCroswell
0bb6bc38d2 Scanner - Be Dey Incapacitated? 2016-06-08 10:38:17 -04:00
SamCroswell
56fd1bc9e5 Scanner - Minor Fix 2016-06-08 10:27:11 -04:00
SamCroswell
934267b2b6 Scanner - Initial Commit 2016-06-08 10:26:54 -04:00
Fox-McCloud
f74db988e2 Removes Hulk+Double Energy Sword 2016-06-08 02:44:41 -04:00
Fox-McCloud
4fa4b253ef Nerfs Tabling 2016-06-08 02:14:06 -04:00
Fox-McCloud
5238628d9d Grab Fixes and Throwing Refactor 2016-06-08 01:57:58 -04:00
SamCroswell
509752f678 Spelling Fix 2016-06-07 21:59:35 -04:00
Fox McCloud
3594337638 Merge pull request #4558 from monster860/cluwne_voice
Adds comical implants
2016-06-07 09:31:02 -04:00
TheDZD
fc22b855ef Merge pull request #4615 from Krausus/DBConnSpamFix
Fixes Excessive Database Reconnections
2016-06-07 09:00:03 -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
Krausus
c5fc47eca4 Fixes repeated database reconnections
setup_database_connection resets the database connection each time it's
called, and was being called for each new client
2016-06-07 05:05:02 -04:00
Fox-McCloud
bb02bfa284 Experimentor Duplication Limit 2016-06-07 02:25:06 -04:00
Isaac Erwin
eca41351cd MrBarrelrolll Fluff Item
Adds in a fluff item for MrBarrelrolll, the Viridi Protegat. It's
functionally identical to the roman armor.
2016-06-07 00:16:00 -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
TheDZD
50d801ad1e Merge pull request #4605 from Fox-McCloud/experimentation
Fixes Experimentor Cold Critical Reaction
2016-06-06 22:10:14 -04:00