Commit Graph

27105 Commits

Author SHA1 Message Date
phil235 11ca987acb Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.
Two mobs can no longer pull the same mob at the same time. Pulling someone break any other pull/grab from other mob on that person.

The grab item is gone entirely.

You can now only grab one mob at a time, instead of two (one for each hand).

Being aggressively grabbed or more now counts as being restrained (like handcuffed). A neck grab or more makes you lie down and prevents you from getting up until the grab is broken.

Fixes movement when moving with a grabbed person.
Fixes movement when moving a pulled person around you diagonally.
Fixes neckgrab moving the victim on your turf even if the turf is dense.
2016-05-24 01:28:04 +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
Jack Edge 41c3af76e3 MORE SKELETON JOKES 2016-05-13 19:30:18 +01: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
Annie Acosta ec90f1d23f gives security their normal headsets back (#17467) 2016-05-13 12:47:15 -05:00
Jack Edge 889c7240f0 Merge branch 'master' into voiced-skeletons 2016-05-13 18:37:23 +01:00
AnturK 2372330eef Merge pull request #17611 from Crushtoe/grammar-fix
Fixes a grammar issue with lockers
2016-05-13 19:33:49 +02:00
AnturK 17861f3395 Merge pull request #17569 from MrPerson/come_up_with_joke_later
Close the UI when you lock a lockbox
2016-05-13 19:32:15 +02: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 7ab038d627 Merge pull request #17579 from phil235/FixHeaterSign
Fix bundle: space heater & signs
2016-05-13 19:29:33 +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
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
Joan Lung 1ab038a7b3 Fixes multi-blood boil (#17584) 2016-05-13 10:00:56 -05:00
Joan Lung 5ffe5bc13e Raise Dead rune no longer allows sacrificing cultists to raise the dead mob (#17575) 2016-05-13 09:59:16 -05:00
Jack Edge c9b821ce23 Moves is[subspecies] to is_helpers 2016-05-13 14:18:52 +01: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
bawhoppen b7a7f7c470 2 small changes (#17543)
Survival Knife sprite and sandbag layer fix
2016-05-12 21:53:59 -05:00
Joan Lung bfbb76df0b Merge pull request #17477 from KorPhaeron/hugbox
Makes drakes more hugbox
2016-05-12 20:04:45 -04:00
Joan Lung 92925d06b1 subtypes why (#17583) 2016-05-12 16:49:12 -05:00
TechnoAlchemist 842441062c Fixes announcement sound pref. (#17394)
* "I'm not sure what shadowlight was thinking"

PRing this for shaps because their shit is broke.

Announcement sounds will now be on by default instead of being muted for everybody.

* Does what Phil says

* woops
2016-05-12 23:07:41 +02:00
Joan Lung 7e3d878781 Cultists can now unanchor and move around cult structures (#17573)
* Cultists can now unanchor and move around cult structures

* helpful messages for unhelpful cultists

* checkpocalypse
2016-05-12 23:02:23 +02:00
Joan Lung 43444eaf35 Tweaks cult pylons (#17571)
* Tweaks cult pylons

* todo

* longer delay if failed conversion instead of shorter
2016-05-12 21:40:54 +01:00
Jack Edge 049d23cde9 Merges birdboat survival boxes into mainline
- Made new survival+radio boxes, and set Birdboat jobs to use them.
- Also deleted some unneeded lines in boxes.dm
2016-05-12 16:36:25 +01:00
Crushtoe 69508ecc90 Fixes grammar issue 2016-05-12 08:19:04 -05: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
Cheridan 7dbecfaabd Merge pull request #17568 from KorPhaeron/gang
Gang Stat Tracking
2016-05-12 01:17:28 -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
phil235 398cb06974 Fixes space heater temperature setting function.
Fixes sign structures becoming blank with detached. The detached sign now keep the sign's sprite.
2016-05-11 23:33:15 +02:00
Cheridan 58319051dd Merge pull request #17558 from phil235/WashingFix
Fixes washing machine
2016-05-11 16:29:06 -05: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
Joan Lung bc6c4ffb29 Merge pull request #17555 from coiax/nice-cult-doors
Doors on Shuttle 667 now open for anyone; also minor candle fixes
2016-05-11 13:24:20 -04: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