Commit Graph

7716 Commits

Author SHA1 Message Date
PKPenguin321
5cce6a6d50 eliminates a hard tell in microlaser desc (#17669) 2016-05-16 09:48:40 -05:00
oranges
c0fc836e3e Readd pick to generate_messages for skeleton
This causes it to pick a list instead of a message
2016-05-15 20:17:47 +12:00
Cheridan
4c89a3a863 Merge pull request #17639 from Iamgoofball/patch-40
Removes shitty shoehorned references.
2016-05-14 18:45:32 -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
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
AnturK
fc924abd2d Merge pull request #17601 from Bawhoppen/medicalbelt
Lets medical belts hold more types of stuff
2016-05-14 14:03:01 +02:00
Cheridan
d5c70bc5f2 Merge pull request #17613 from coiax/morphling-holodeck
Removes materials from holodeck chairs and windows (Fixes #17612)
2016-05-13 23:35:00 -05:00
Iamgoofball
38e38ca3da Update toys.dm 2016-05-13 14:05:35 -07:00
Jack Edge
611e19e49a Window debris on creation, release on destruction 2016-05-13 21:50:03 +01:00
Iamgoofball
c0ea29ad9a Removes shitty shoehorned references. 2016-05-13 13:12:19 -07: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
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
7ab038d627 Merge pull request #17579 from phil235/FixHeaterSign
Fix bundle: space heater & signs
2016-05-13 19:29:33 +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
Joan Lung
1313d45aff Merge pull request #17565 from KorPhaeron/cakehat3
Nerfs cakehat
2016-05-13 11:52:32 -04:00
bawhoppen
b7a7f7c470 2 small changes (#17543)
Survival Knife sprite and sandbag layer fix
2016-05-12 21:53:59 -05: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
Jack Edge
d9bfa9e820 Removes materials from holodeck chairs and windows
- Breaking a chair with NODECONSTRUCT no longer produces materials.
- Breaking a window with NODECONSTRUCT now reliably does not produce
materials.
- Also moved the creation of debris into the window's shatter() proc,
because doing it on creation is dumb, and unreliable.
2016-05-12 16:30:38 +01:00
Crushtoe
69508ecc90 Fixes grammar issue 2016-05-12 08:19:04 -05:00
Lularian
353adf8e94 medbelts pls 2016-05-12 00:08:38 -05: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
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
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
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
MrPerson
bb39eefcd9 Close the UI when you lock a lockbox
Fixes #17407
2016-05-11 01:47:47 -07:00
KorPhaeron
0c996d538f Cake Hat 2016-05-10 23:09:27 -05:00
Robustin
d1a2d1d0bd SLIP-SANITY (#17096)
* Chemo

* CHEMO

* Chemo

* Update growninedible.dm

* Corrected math

* decimals needs 0's

* NOW EVERYBODIES HAPPY YAYYY

* Updated Botany nerf

* Conflict correction & tweaks
2016-05-10 22:52:05 -05:00
phil235
1b24cc7e6a Moved crayon code out of toys.dm and into crayons.dm
Fixes being able to throw kinetic grabs.
Fixes washing machine code being shit. Also fixes clothes coloring via washing machine being broken.
2016-05-10 22:53:47 +02:00
Jack Edge
c32f5bb676 Fixes spawning lit candles printing messages
Also makes candles light stuff when they're in your hand.
2016-05-10 19:13:11 +01:00
Joan Lung
a4f1318d88 Merge pull request #17496 from coiax/pie-pie-pie
Cream pie map edits
2016-05-10 11:06:41 -04:00
Jack Edge
631d854187 Only one pie in a closet 2016-05-10 11:46:50 +01:00
Jack Edge
91a1745e7e Griffin actually talks 2016-05-10 10:18:32 +01:00
Jack Edge
a30736e983 Bug fixes and griffin noises 2016-05-10 10:16:11 +01:00
Cheridan
8f6a5f7f1f Merge pull request #17508 from KorPhaeron/cutandtake
Continues to inch dismemberment threshhold downwards
2016-05-10 02:26:21 -05:00
Jack Edge
4a2bea0ee7 Merge branch 'master' into voiced-skeletons 2016-05-10 07:05:06 +01:00
Jack Edge
d95c01b642 Work work 2016-05-10 07:02:51 +01:00
Nerd Lord
da10d5c143 Adds healy glows to cult pylons and the medbeam gun 2016-05-09 19:37:15 -04:00
Cheridan
ee4d3785a3 Merge pull request #17484 from ChangelingRain/fixrobustinscode
Cleans up some cult code
2016-05-09 15:35:14 -05:00
Razharas
0a3ddc886c Turns tablecrafting into personal crafting (#17341)
* Converts tablecrafting to datums

* Adds crafting.dm

Adds crafting.dm

* Fix merge conflicts

Fix merge conflicts

* Fixes dme

* Fixes returns

Fixes returns

* Only check hands and remove old paths

Only check hands and remove old paths

* Recipe fixes

Recipe fixes

* Removed action button

Removed action button
Added small ui button to inventory near the intent wheel
Removed debug
href_list is not longer /list

* Added adjucent checks

Added adjucent checks

* Snacks now get chems from parts

Snacks now get chems from parts

* Complex food fuckery fixed

Complex food fuckery fixed

* Fixes old recipe

Fixes old recipe

* Fix to infinite loops in reagent extraction

Fix to infinite loops in reagent extraction
It was finding old empty containers and tries to extract from them

* Fixes hands not checking

Fixes hands not checking

* Fixes reagents fucking up

Fixes reagents fucking up

* Even more reagent fuck ups fixed and comments

Even more reagent fuck ups fixed and comments

* Fixes all the shit i could find

Fixes all the shit i could find

* Removes debug and mechs

Removes debug and mechs

* Argument renaming

Argument renaming

* Fixes all argument names

Fixes all argument names

* Final fix of arguments

Final fix of arguments
2016-05-09 18:14:48 +02:00
Jack Edge
314a8f9d59 Merge branch 'master' into voiced-skeletons
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/objects/items/toys.dm
2016-05-09 16:11:22 +01:00
Cheridan
e72d6c32f9 Lavaland Mapping Volume 3 (#17474)
Tweaks:
-Removes an errant sleeper from the animal hospital
-Fixes invisible walls/weirdness with sandeffect turfs (replaces with sand effect decals), adds breath masks.
-Converts both to TGM format.

And the big one: Completely remodels clown ruin. I won't ruin the surprise. Welcome to clown planet.
2016-05-09 01:59:59 -05:00
KorPhaeron
31c03c7360 Dismemberment 2016-05-09 01:48:34 -05:00
Jack Edge
4e0ffcca23 Contraband clown pie crate 2016-05-09 00:32:14 +01:00
Jack Edge
40c90f6800 Added cream pie closet, for clowns, by clowns 2016-05-08 22:10:56 +01:00