Commit Graph

15775 Commits

Author SHA1 Message Date
phil235 dd2c91ca64 two tiny fixes (#17658) 2016-05-16 10:03:57 -05:00
Joan Lung f1f5f73922 Merge pull request #17661 from GunHog/Borgie_Law_Fix
Fixes directly uploading laws to borgs
2016-05-16 11:01:33 -04:00
Joan Lung d1307bfac7 Merge pull request #17656 from KorPhaeron/swoop_cooldown
[s] Fixes infinite swoop exploit
2016-05-15 20:40:57 -04:00
coiax feb02815ad Fixes #17665, abductor event finds people now (#17686) 2016-05-15 19:40:04 -05:00
Incoming5643 01ce91bf6d Specflag'd Dismemberment (#17469)
* Adds NODISMEMBER to the species specflags to remove the var. It's not DISMEMBER because that's the default expectation and specflags need to be manually set for every race.

Merges RESISTHEAT and RESISTCOLD into RESISTTEMP. Every situation where one occurred the other did as well. It also doesn't make thermodynamic sense that something good at one wouldn't be good at the other anyways.

* T H E S E  A R E  N O T  B I T F L A G S
2016-05-15 22:05:42 +02:00
Joan Lung 7d045c4428 Merge pull request #17622 from Robustin/ruserious
Removes Nar-Sie from portal storm event
2016-05-15 12:43:01 -04:00
AnturK a9b26391e9 Merge pull request #17654 from coiax/fix-17624
Fix #17624; shuttle loan checks for banned items
2016-05-15 14:59:42 +02:00
AnturK 562559e2d8 Merge pull request #17652 from coiax/fix-17651
Fixes #17651; missing limbs needed for message
2016-05-15 14:58:24 +02:00
AnturK e61e6c7aab Merge pull request #17422 from nullbear/blood-transfusion-fix
Blood Type Refactor
2016-05-15 14:55:34 +02:00
oranges 4a365aecdd improve chatter regex to prevent infinite loop
R.find can be called repeatedly to update the R.groups and will return 0 if no match is found
2016-05-15 20:12:17 +12:00
Cruix 0a839f7461 swat mask now hides hair (#17675) 2016-05-14 19:24:39 -05:00
Iamgoofball 9f57bca8f7 Adds two alternate shuttles (#17592)
* I got the results of the test back - I definitely have breast cancer.

* aaaaaa

* need help translating shuttle code, will pay in shitcode

* fixes

* Update emergency_imfedupwiththisworld.dmm

* Removes copyright infringement

* Update shuttles.dm
2016-05-14 19:06:25 -05:00
TehZombehz 076fc0df79 Adds Bone Weaponry (#17672)
* Adds Bone Weaponry

Adds Bone Spears, Axes, and Daggers, all craftable.

* '''Balance'''

I listen to the suggestions of others.

* Fixes
2016-05-14 18:31:36 -05:00
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
GunHog 9786c614c1 Fixes directly uploading laws to borgs
- Borgs without a mind do not accept attempts to relaw them.
- Fixes law board's install() proc being fed incorrect arguments.
2016-05-14 12:16:22 -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
KorPhaeron 32a90e3a55 Swoop Cooldown 2016-05-14 06:21:20 -05:00
Jack Edge e5639e3874 Fix #17624; shuttle loan checks for banned items
- Shuttle now peforms standard no mobs, nuclear disks, etc. checks when
sending the shuttle for a loan to Centcom.
2016-05-14 12:07:44 +01:00
coiax 81ffb5e385 [s] Removes debug world << from camo stamps (#17649) 2016-05-14 05:47:35 -05:00
Jack Edge 752de6d34d Fixes #17651; missing limbs needed for message
Fleshmend now only produces a visible message if there are actually
limbs missing, where before it always triggered.
2016-05-14 11:31:55 +01: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
Robustin 05659b153a Adds artificers, reduced juggs/wraiths 2016-05-13 11:01:33 -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
Robustin fc79066a32 WEW 2016-05-12 18:57:42 -04:00
Robustin 6dd999756e Makes Nar-Sie portal storm not retarded 2016-05-12 17:17:41 -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