Lady-Luck
608b7c2643
Removes Stealing a RCD as an objective ( #4652 )
...
* Removes Stealing a RCD as an objective.
* Fixed
2016-06-13 23:04:16 -04:00
VampyrBytes
15ef6c7f46
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2
2016-06-13 18:27:01 +01:00
monster860
6fc572f5cc
Readds sparks, removes commented code.
2016-06-13 11:37:34 -04: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
Fox-McCloud
64d5eabeac
Telephone is More...Ring-y
2016-06-12 13:26:26 -04:00
Fox-McCloud
1b04261259
Adds in Ability to make Latex Gloves Balloons
2016-06-12 03:28:01 -04:00
monster860
4ad0437b58
gives rcd a ui, and ability to select airlock type and access
2016-06-11 20:06:09 -04:00
taukausanake
53a34039da
FUCK
2016-06-11 18:48:47 -05: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
monster860
f227091d50
Basic shit for rcd ui
2016-06-11 12:37:58 -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
a2f2da09b9
Merge pull request #4608 from Fox-McCloud/remove-mindslave
...
Can Deconvert Mindslaves and Vampire Thralls
2016-06-11 12:11:34 -04:00
monster860
da65415308
Removes relative pathing
2016-06-11 12:11:22 -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
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
taukausanake
130096aced
Hydroponic HUDs
...
Everything is done. Except it doesn't work. I must be missing something somewhere but otherwise I did everything that appeared needing to do. Based it off of mech diag HUD so that might be the issue.
Code as of now does not let you join the server. Need to revert bit by bit and find out what I did wrong
2016-06-09 17:46:09 -05:00
Matt Milosevic
9f52a06829
Why do I forget stuff
2016-06-09 16:27:19 +02:00
Matt Milosevic
349d363f87
Please no more
2016-06-09 16:26:06 +02:00
Matt Milosevic
9ced03b85b
Line notes
2016-06-09 13:46:15 +02: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
c6b4539548
Finishing touches
2016-06-08 15:11:24 -04:00
Matt Milosevic
bc86a86ece
Hopefully final
2016-06-08 18:30:26 +02: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
Fox-McCloud
4fa4b253ef
Nerfs Tabling
2016-06-08 02:14:06 -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
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
monster860
64ea452f20
Puts UI on it's own plane
2016-06-06 17:12:28 -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
Fox McCloud
674a5d681f
Merge pull request #4593 from pinatacolada/soap
...
command soap books
2016-06-05 22:27:16 -04:00
TheDZD
2681af396f
Merge pull request #4601 from monster860/tcomms_crash
...
Removes ability of bus to talk to another bus, thus fixing a server crash bug.
2016-06-05 20:42:57 -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
monster860
f306e6fb98
Removes ability of bus to talk to another bus.
2016-06-05 13:56:08 -04:00
