Commit Graph

15751 Commits

Author SHA1 Message Date
Robustin
bb0194802f Ends traitorling + snowflake rules, totally unrelated to #17618 (#17620)
* Snowflek-b-gone

* Traitorling gone
2016-05-14 17:13:00 -05:00
Mercenaryblue
72ff107481 Clown Update - Golden Bike Horn (#17530)
* Golden Bike Horn 1.0.0

Adds the golden bike horn to the game.

* Golden Bike Horn 1.0.1

Adds a deaf check

* Golden Bike Horn 1.0.2

Removed the extra bike horn sound when hitting yourself.

* Golden Bike Horn 1.0.3

flip_mobs() proc optimize the code.

* Golden Bike Horn 1.0.4

Fixes

* Golden Bike Horn 1.0.4.b

mob/user

* Golden Bike Horn 1.0.4.c

Last change

* Golden Bike Horn 1.0.4.d

No longer responsible for the lack of returns
Honk

* Golden Bike Horn 1.0.4.f

Fudge
2016-05-14 16:11:45 -05:00
Cheridan
ba3f4f4733 Merge pull request #17634 from KorPhaeron/austurfs2
Removes extra lines from austurfs
2016-05-14 15:10:55 -05:00
phil235
a1a9a6585b Fixes projectile destruction breaking energy guns. 2016-05-14 16:31:17 +02:00
Daturix
514047f8d8 Tesla gen to cargo orders (#17628) 2016-05-14 07:02:23 -05:00
AnturK
b694b1cbf9 Merge pull request #17136 from Razharas/HoloshitHalfFix
Adds flag to mark items as holograms
2016-05-14 13:53:20 +02:00
coiax
acd3eb88f5 [s] Removes another world << from stamps (#17655)
Man, I suck at this.
2016-05-14 06:41:13 -05:00
coiax
81ffb5e385 [s] Removes debug world << from camo stamps (#17649) 2016-05-14 05:47:35 -05:00
Joan Lung
8b656d2603 Merge pull request #17284 from MMMiracles/spookyjookie
Lavaland Ruins
2016-05-13 20:22:56 -04:00
Shaps
cbc7a8b654 Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)
* Actually fixes announcements the right way

* Flips the SOUND_ANNOUNCEMENTS bitflag so that having it means you hear announcements

* Updates the save file version
2016-05-14 00:55:50 +02:00
Joan Lung
c79c7f0d86 Merge pull request #17619 from phil235/FixRnDThrow
Fix bundle. experimentor, rnd machines, mob throwing
2016-05-13 17:36:51 -04:00
phil235
487fb01366 Properly sever the link between rd computer and protolathe/circuit imprinter/destructive analyzer when the rd computer is screwdrived. 2016-05-13 22:23:16 +02:00
Joan Lung
b0a0063a86 Merge pull request #17425 from coiax/voiced-skeletons
Some talking toys now audibly chatter
2016-05-13 14:45:12 -04:00
Razharas
b46de70537 Makes dismemberment more adjustable (#17587)
* Makes dismemberment more adjustable

Makes dismemberment more adjustable
Items now return chance for dismemberment
Bodyparts now decide if they are dismemberable or not by the specific
item
Items now decide what sound to play on dismemberment
No balance changes here

* Owner into H

Owner into H
2016-05-13 20:27:06 +02:00
Iamgoofball
65fb5163bd Removes revolver speed loading delay (#17595)
Desucake said to do this.
2016-05-13 12:57:27 -05:00
Jack Edge
889c7240f0 Merge branch 'master' into voiced-skeletons 2016-05-13 18:37:23 +01:00
AnturK
b9304901c6 Merge pull request #17435 from Shadowlight213/volumefix2
Removes volume control for admin midis
2016-05-13 19:31:04 +02:00
AnturK
2133f8b66e Merge pull request #17580 from phil235/FixHugGender
Fixes hugging message
2016-05-13 19:28:55 +02:00
Joan Lung
a1db58ed75 Merge pull request #17610 from coiax/birdboat-clean
Merges Birdboat misc.dm into mainline
2016-05-13 13:20:03 -04:00
KorPhaeron
4179cdeae9 Removes extra lines from austurfs 2016-05-13 10:56:25 -05:00
AnturK
d41be10210 Merge pull request #17605 from coiax/urgent-golem-jaunter-fix
[s] Golems target Free Golem ship when jaunting
2016-05-13 17:55:58 +02:00
AnturK
08ad870dca Merge pull request #17603 from KorPhaeron/austurfs
Ausops Turfs
2016-05-13 17:53:21 +02:00
Joan Lung
1313d45aff Merge pull request #17565 from KorPhaeron/cakehat3
Nerfs cakehat
2016-05-13 11:52:32 -04:00
Cruix
d97b15ef8d Fixed some foam dart bugs (#17563)
* Fixed foam darts being reset when fired
Added the ability to remove pens from foam darts
Foam darts with pens inside them are no longer destroyed on being fired

* Fixed foam dart duplication bug

* Added destroy procs to projectiles and foam darts.
2016-05-13 13:27:19 +02:00
Jordie
c66c8b9f63 Merge pull request #17531 from Shadowlight213/cleanbetter
Improves bot scanning
2016-05-13 14:16:23 +10:00
Joan Lung
f95e956d88 Merge pull request #17429 from Shadowlight213/ctfnotify
Adds a notification for ghosts for enabling or disabling CTF
2016-05-12 23:59:03 -04:00
Joan Lung
bfbb76df0b Merge pull request #17477 from KorPhaeron/hugbox
Makes drakes more hugbox
2016-05-12 20:04:45 -04:00
phil235
a49e4cf87d Fixes experimentor having no sprite when panel open.
Fixes panel opening deconnecting the wrong rnd console
Fixes not being able to throw mobs.
2016-05-12 21:37:18 +02:00
Jack Edge
8fd21c79dc Merges Birdboat recycler into mainline
- Birdboat now has an /obj/machinery/recycler/deathtrap which functions
the same as the previous birdboat specific one. Various vars have been
added to the normal recycler to allow it to mimic the Birdboat one.

- Recyclers now recycle the contents of any items that they eat, in
addition to the items themselves. Throwing a full toolbelt in will eat
the tools as well.
2016-05-12 13:58:08 +01:00
Jack Edge
da8d8effb5 [s] Golems target Free Golem ship when jaunting 2016-05-12 11:00:46 +01:00
KorPhaeron
eae335e281 Forgot a commit 2016-05-12 03:51:56 -05:00
KorPhaeron
ec5291471d Removes warning 2016-05-12 03:42:31 -05:00
KorPhaeron
ce293fe6da Dragon Fixes 2016-05-12 03:25:36 -05:00
KorPhaeron
d93f87cf96 Removes """""humour"""" 2016-05-12 03:18:05 -05:00
KorPhaeron
5f6ef4a383 Ausops Turfs 2016-05-12 03:15:43 -05:00
Shadowlight213
a2aa7c6a0e Fix 2016-05-11 21:39:02 -07:00
TechnoAlchemist
4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05:00
lordpidey
08735fa733 Employment contracts can once again be copied. (#17510)
* Employment contracts can once again be copied.

* Removes erroneous argument.
2016-05-11 22:17:02 -05:00
Incoming5643
2368de554f Healing wand/staff regenerate limbs on use (#17532)
* Fully_heal regenerates limbs

* Working in the browser is such a bad idea

* Seriously not a great idea

* Don't do this at home kids
2016-05-11 19:27:18 -05:00
phil235
55821bb92c Message when hugging someone now uses the gender neutral term "them". This fixes being able to tell someone's gender even when they wear clothes hiding their identity. 2016-05-11 23:56:01 +02:00
Cheridan
58319051dd Merge pull request #17558 from phil235/WashingFix
Fixes washing machine
2016-05-11 16:29:06 -05:00
Razharas
d0d93d1d81 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoloshitHalfFix
Conflicts:
	code/modules/crafting/table.dm

Merge conflicts fix
2016-05-11 23:46:51 +03:00
Shadowlight213
320bb39eba Removes abductor ability to use guns. (#17515)
* Removes abductor ability to use guns.
Removes agent starting out with an alien blaster

* removes comment

* Makes Abductors able to use alien pistol

Alien pistol now has ALLOW_ALL trigger guard to overcome abductor's
natural NOGUN.

Pistol now starts in the backpack, and the wondertool on the belt.

In addition:
 - Replace multiple copies of IsAbductor() with a single isabductor()
   proc in code/__HELPERS/mobs.dm
 - Adds icon for alien firing pin
 - Adds abductor span for ayylien communication
2016-05-11 20:28:52 +01:00
Jack Edge
145221fb1b Fadeoff is too strong, removed 2016-05-11 15:15:18 +01:00
Joan Lung
60237bbb31 Merge pull request #17548 from coiax/fix-17497
Fix #17497; moves bardrone from map to drone types
2016-05-11 09:29:55 -04:00
Jordie
ea52cee578 Merge pull request #17511 from ChangelingRain/bootsuit
Replaces miner jackboots with mining boots
2016-05-11 22:59:36 +10:00
Jordie
be58aedcff Merge pull request #17549 from ChangelingRain/spaceshade
Shades can move in space
2016-05-11 22:59:28 +10:00
Jordie
94b5d1c088 Merge pull request #17527 from ChangelingRain/glowyhealything
Adds healy glows to cult pylons and the medbeam gun
2016-05-11 22:51:22 +10:00
Nerd Lord
930b9ba91b sanity? 2016-05-11 08:44:33 -04:00
Jack Edge
edc47a564a Switches the naming booleans around 2016-05-11 12:56:02 +01:00