cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,088 Commits 21 Branches 0 Tags
265c0e14849f2bc8b7b986a18410d2921550271f
Commit Graph

27146 Commits

Author SHA1 Message Date
Xhuis
265c0e1484 Conflicts IV 2016-05-15 01:05:53 -04:00
Xhuis
23073619a2 Conflicts III 2016-05-15 00:59:44 -04:00
Xhuis
d92ec37f2c Conflicts II 2016-05-15 00:59:30 -04:00
Xhuis
98139f8990 Conflicts I 2016-05-15 00:59:29 -04:00
Xhuis
45ef8a5e00 Ratvar, the Clockwork Justiciar 2016-05-15 00:59:28 -04: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
Cheridan
4c89a3a863 Merge pull request #17639 from Iamgoofball/patch-40 
Removes shitty shoehorned references.
 2016-05-14 18:45:32 -05:00
Joan Lung
c2336cc8c9 Cult runes no longer cover the entire tile (#17641) 2016-05-14 18:41:44 -05:00
Joan Lung
febfc859a8 Fixes cults converting things they shouldn't be able to (#17640) 
* Fixes cults converting things they shouldn't be able to

* comment correction

* no message

* it is, actually
 2016-05-14 18:40:29 -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
phil235
a1a9a6585b Fixes projectile destruction breaking energy guns. 2016-05-14 16:31:17 +02: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
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
AnturK
c7e05a16b7 Merge pull request #17448 from xxalpha/materialmemes 
Fixed drone dispenser material exploit
 2016-05-14 13:49:13 +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
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
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
xxalpha
d75bb75567 Fixed drone dispenser not handling materials correctly in some cases. 
qdelmaterials
 2016-05-13 22:41:49 +01: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
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
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
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
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
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
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