Commit Graph

11315 Commits

Author SHA1 Message Date
Swag McYolosteinen 0f6705d856 Merge pull request #11560 from Fox-McCloud/runereveal
Fixes Bibles Not Revealing Runes
2015-09-13 17:32:40 +02:00
Swag McYolosteinen 49968d033d Merge pull request #11675 from MrStonedOne/patch-36
Fixes text gurbling in coms console and shuttle call's priority announcement
2015-09-13 17:31:51 +02:00
Swag McYolosteinen b5e4eefe8b Merge pull request #11685 from bgobandit/fuckingprogressbarsfuck
Mop progress bar now actually works.
2015-09-13 17:30:50 +02:00
Swag McYolosteinen ac41b600ce Merge pull request #11718 from phil235/TableClimbingFixes
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
Swag McYolosteinen d57fac141a Merge pull request #11724 from RemieRichards/LargeInhands
Inhands can now come in ANY SIZE, not just 32x32!
2015-09-13 17:23:36 +02:00
Fox-McCloud 9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Jordie 7530c0e133 Merge pull request #11680 from bgobandit/honktarget
Adds a clown shooting target.
2015-09-13 21:50:53 +10:00
Jordie d75295a9f6 Merge pull request #11577 from Jalleo/x
Fixes custom cult structure in library backroom
2015-09-13 21:47:56 +10:00
Jordie 15e50de0fe Merge pull request #11694 from bear1ake/point-zero
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
Jordie a1a2417d46 Merge pull request #11681 from GunHog/MalfReportMiniFix
AI Malfunction round-end report mini-fix
2015-09-13 21:45:03 +10:00
Jordie 47fb102125 Merge pull request #11633 from bgobandit/cocosprite
Coffee and tea mugs now appear empty when empty.
2015-09-13 21:44:42 +10:00
Cheridan 683b0803f7 Merge pull request #11722 from Hamadryad-1/Fixes-infinite-resources-in-Orion-Trail
Fixes Infinite Resources in Orion Trail
2015-09-12 18:51:20 -05:00
Fox-McCloud ffa823e5b9 floor tile materials fixup 2015-09-12 16:11:48 -04:00
bear1ake c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero
Conflicts:
	code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
Fox-McCloud 89fa65c127 Fixes Consistency Issue with Materials 2015-09-12 03:51:33 -04:00
Razharas f9a01d1365 Merge pull request #11580 from xxalpha/protocontainer
Changed protolathe code to use material container.
2015-09-12 08:56:47 +03:00
Razharas fbe1781374 Merge pull request #11609 from AnturK/outfits
Outfit datum
2015-09-12 08:56:12 +03:00
Remie Richards 82e577be0b Items may now have inhands from 1x1 (why) to INFINITYxINFINITY (again, WHY), this allows for ridiculously large items!
Adds a center_image() proc that centers an image larger or smaller than world.icon_size (32) so that it appears in the center of a human mob, like inhands.
2015-09-12 00:45:14 +01:00
A Manifestation f76e8e8af5 Fixed! 2015-09-11 14:30:13 -07:00
phil235 c069ea0a7d Fixes runtime in monkey/attack_hand()
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
Fixes runtime with krokodil addiction
Xenomorph can no longer get addicted or overdose on reagents.
2015-09-11 18:08:54 +02:00
xxalpha 28889d2b6a Changed protolathe code to use material container.
Clean proc, typo fix

Standard sheet values
2015-09-11 12:39:32 +01:00
Razharas 3a63c31614 Merge pull request #11626 from Memendia/master
Suicide txt fix
2015-09-11 14:16:30 +03:00
Razharas 45fb337732 Merge pull request #11487 from bgobandit/matsblastusa
Adds materials to some items for recycling purposes.
2015-09-11 14:03:18 +03:00
Razharas f3ae87756c Merge pull request #11649 from Firecage/bucklingtext
Fixes the buckling message.
2015-09-11 04:03:40 +03:00
Razharas 17e5d0eea5 Merge pull request #11525 from xxalpha/dryshoes
Absorbent galoshes.
2015-09-10 22:01:03 +03:00
Razharas ff5747602a Merge pull request #11668 from CosmicScientist/DroneCooldown
Drone dispenser's cooldown now in a var
2015-09-10 18:29:46 +03:00
Swag McYolosteinen d216e60477 Merge pull request #11612 from Iamgoofball/patch-117
Buffs the fuck out of Changeling Armor
2015-09-10 17:10:41 +02:00
Jordie f13f6b6acf Merge pull request #11652 from Shadowlight213/Docyborgsdreamofelectricgreentext
Cyborgs no longer count against escape alone
2015-09-10 22:01:34 +10:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit 4efae3bc02 Mop progress bar now actually works. 2015-09-09 22:04:47 -04:00
GunHog a6beaa26a2 Derpfix
Forgot to set the players var back.
2015-09-09 15:48:52 -05:00
GunHog 920af6eb4a Small fixs to Malf Round Report
- Fixes an instance of a gibbed AI appearing to have purchased no
modules.
- Now properly supports multiple Malf AIs.
2015-09-09 15:44:23 -05:00
bgobandit cf42935119 Adds extra HONK. Tweaks sprite. 2015-09-09 16:27:21 -04:00
bgobandit a8ce6c012b Adds a clown shooting target for security to unload their anger. 2015-09-09 14:35:45 -04:00
bgobandit b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa
Conflicts:
	code/modules/assembly/flash.dm
2015-09-09 14:04:41 -04:00
Kyle Spier-Swenson 1601c60628 Fixes text gurbling in comsconsole priority announcement
I don't want to have to find everything that uses priority_announce() and make it strip the input at the source, this seems like a better way.
2015-09-09 08:30:18 -07:00
Firecage bdc9b792f7 buckling text span fix. 2015-09-09 09:29:51 +02:00
palpatine213 6b1e20ea19 Changed the switch to an istype check. Also modified the clone hijack objective for consistency. 2015-09-08 17:09:54 -07:00
CosmicScientist 882c404c27 Cooldown now in a var. 2015-09-09 01:01:55 +01:00
Razharas 161156cffc Merge pull request #11585 from bgobandit/legitposters
Poster changes!
2015-09-09 02:38:56 +03:00
Swag McYolosteinen 71270764da Merge pull request #11571 from xxalpha/airlocking
Fixed a couple of bugs with airlocks.
2015-09-08 20:49:40 +02:00
xxalpha a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes
Conflicts:
	code/__DEFINES/misc.dm
2015-09-08 16:56:37 +01:00
AnturK c2a26c81e7 Adds Create Custom Outfit admin verb
Sechud fix
2015-09-08 14:41:15 +02:00
palpatine213 01a4e6653d Cyborgs no longer count against escape alone 2015-09-07 17:58:43 -07:00
Firecage 812f5b4094 Fixes the buckling message. 2015-09-07 23:52:30 +02:00
blah bcdf5666e8 Fixes Orion Trail properly the error was a rogue ! in the top of the topic that was added by accident 2015-09-07 18:37:41 +01:00
bgobandit 2cee8c85dc Reworks the poster lists per cheridan 2015-09-07 12:18:06 -04:00
AnturK b3b18d0080 Job Outfits 2015-09-07 18:13:08 +02:00
bgobandit ed26da8366 Coffee and tea mugs now appear empty when empty. 2015-09-07 10:53:05 -04:00
Razharas 9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints
Bloody footprints!
2015-09-07 16:07:03 +03:00