Commit Graph

22686 Commits

Author SHA1 Message Date
taukausanake
e9d9a4c345 Mistakes were made 2016-06-15 19:11:49 -05:00
Fox-McCloud
b89364e1df Gives Warden Krav Maga Gloves 2016-06-15 17:15:58 -04:00
FreeStylaLT
9e95dfcd17 added the actual items to the list 2016-06-16 00:09:13 +03:00
VampyrBytes
b7bc73a692 moar bugfixes 2016-06-15 20:26:09 +01:00
VampyrBytes
ffc01b6ac2 improves command setting
thanks @Krausus
2016-06-15 18:56:08 +01:00
Fox-McCloud
4835482c53 Chem Patch Tweaks 2016-06-15 06:45:00 -04:00
LittleBigKid2000
7d5d29d610 Rewords various objectives and makes 'Follow the inviolate' always succeed (#4648)
* Rewords various objectives, makes 'Follow the inviolate' always succeed.

* Fixes the capitalization of NanoTrasen

* Fixes inviolate objective so that admins can make it fail, hopefully

* Fixes the thing

* Re-reworded AI hijack objective
2016-06-15 06:32:45 -04:00
KasparoVy
b45ef2da5d Dethralling a Shadowling Thrall Clears Darksight if it's Activated (#4682) 2016-06-15 05:34:41 -04:00
tigercat2000
c7bdb89454 Fix SST shuttle, make it a real shuttle (#4675) 2016-06-15 04:48:26 -04:00
FreeStylaLT
f03178c1f2 Reduces stetchist's and suppressor's prices 2016-06-15 02:58:26 +03:00
FreeStylaLT
765d0ddca9 goodies only pistols, no list yet 2016-06-15 02:55:48 +03:00
Twinmold93
674bfe5d08 No Longer Can Eat Cybernetic Implants (#4669)
This makes is so you can no longer eat cybernetic implants improperly,
just because they are in organ code. Fixes the check that originally
made it so you couldn't eat them.

🆑 Twinmold
Fix: Fixes being able to eat cybernetic implants so you cannot eat
them/force feed them to people.
/🆑
2016-06-14 17:55:40 -04:00
TheDZD
d2b741b1e6 Merge pull request #4643 from Fox-McCloud/latex-glove-balloon
Adds in Ability to make Latex Gloves Balloons
2016-06-14 10:17:01 -04:00
VampyrBytes
7979706c5a strips out old emote code 2016-06-14 09:03:39 +01:00
Fox-McCloud
ac0d05d6cf His Grace Tweak 2016-06-14 03:42:47 -04:00
Tigercat2000
599527a480 Add skirts to wardrobe lockers. 2016-06-13 21:13:10 -07:00
Tigercat2000
d927504dc1 Fix compile, Add job restriction column, make job skirts betterish
Job skirts now only cost 3 points, any further job skirts selected will
not count towards points. Yes, you still spawn with multiple skirts if you
are in a position that has them, no, I can't fix it.
2016-06-13 21:03:58 -07:00
Tigercat2000
d5ae124a92 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi
2016-06-13 20:11:29 -07:00
Kyep
50afa5b6a6 Clarified sentience potion message (#4646) 2016-06-13 23:11:17 -04:00
LittleBigKid2000
1a19b25c95 Removes dust from vox raider base (#4649)
* Is removes dusts from voxxy base

🆑 LittleBigKid2000
Fix: The vox raider's base is now filled with nitrogen instead of
regular dusty air.
/🆑

* Now with 100% less varediting to change air contents
2016-06-13 23:11:03 -04:00
TheDZD
cc2766e7d7 Deathwands and googly eyes (#4653) 2016-06-13 23:07:13 -04:00
TheDZD
7372cd3820 The Ice Age (#4655) 2016-06-13 23:06:15 -04:00
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
Aurorablade
fe6c3e3626 is making a commit its looke like they are trying to commit... (#4657) 2016-06-13 23:02:30 -04: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
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
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
Fox-McCloud
1b04261259 Adds in Ability to make Latex Gloves Balloons 2016-06-12 03:28:01 -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
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
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
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