c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
ae117c134b
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
code/game/jobs/job/security.dm
2015-09-12 18:43:15 +08:00
ce2ee15b57
* Added boundary checks for stack sheets inserting ( fixes #11732 )
...
* Limited material inserting to stack sheets for the protolathe and banana shoes
2015-09-12 12:11:57 +02:00
89fa65c127
Fixes Consistency Issue with Materials
2015-09-12 03:51:33 -04:00
f9a01d1365
Merge pull request #11580 from xxalpha/protocontainer
...
Changed protolathe code to use material container.
2015-09-12 08:56:47 +03:00
fbe1781374
Merge pull request #11609 from AnturK/outfits
...
Outfit datum
2015-09-12 08:56:12 +03:00
4f9e6a33e0
Merge pull request #11678 from GunHog/ChemHeaterBoardFix
...
Fixes missing chem heater board design
2015-09-12 08:53:30 +03:00
4b7cc90478
Fixes goliath tentacles not deleting themselves on a really particular situation, killing the mob with the tentacle hit. The mob must also delete itself on death.
2015-09-12 00:40:42 -03:00
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
922cd5d666
removed extraneous hgibs() call in tanks.dm, turned spaces to tabs in affected files to make remie and everyone else happy
2015-09-11 13:03:33 -07:00
1db6687314
little tweak
2015-09-11 18:19:10 +02:00
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
b13509b9f0
Removed some unneeded istype checks in check_shields().
...
Changed shield block chance to default at 80% for thrown items, 50% for xeno leap.
Moved the tableclimbing fixes to another PR.
2015-09-11 17:11:55 +02:00
eb7e466dfe
Changed facehuggers and alien eggs layers to MOB_LAYER
2015-09-11 14:31:17 +01:00
28889d2b6a
Changed protolathe code to use material container.
...
Clean proc, typo fix
Standard sheet values
2015-09-11 12:39:32 +01:00
426a242f68
Merge pull request #11627 from Jordie0608/thebiblewastheoriginalredtape
...
Resolves #5748 , see jobban reasons from char setup
2015-09-11 14:16:54 +03:00
45fb337732
Merge pull request #11487 from bgobandit/matsblastusa
...
Adds materials to some items for recycling purposes.
2015-09-11 14:03:18 +03:00
d3a61455a2
Ghost follow is now an orbit!
2015-09-10 23:13:28 -07:00
5ca28e3e5c
Fixes pink slime potions.
2015-09-10 22:38:15 -04:00
7cff554a15
Tweaked values. Added ability to block pounces with shields. Changelog.
...
Removed conflicting code.
2015-09-11 01:29:43 +01:00
de9e6475f1
Fixes runtime in monkey/attack_hand()
...
Fixes tableclimbing: no more success message when failing; you can no longer pass through barricade when tableclimbing.
You now have a chance to block things thrown at you with a riot/energy shield, including xeno leap(40% chance).
2015-09-11 02:03:28 +02:00
778564986d
Gives the QM and cargo techs the QM cartridge.
...
Added rarity values for plants lacking them.
2015-09-10 19:06:42 -04:00
e74ca82a47
Merge branch 'master' of https://github.com/tgstation/-tg-station into ReagentReactionRuntimeFix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
icons/obj/assemblies/new_assemblies.dmi
2015-09-10 21:49:39 +02:00
17e5d0eea5
Merge pull request #11525 from xxalpha/dryshoes
...
Absorbent galoshes.
2015-09-10 22:01:03 +03:00
2f9cbf9536
suicide messages for damp rag, tanks, and telebaton
2015-09-10 11:44:27 -07:00
2fab4fe3b6
Fixes a very specific appearance bug where lizard ears/horns wouldn't be properly updated by adding/removing helmets.
2015-09-10 14:23:11 -04:00
34b5dbf5e7
Buffs AE Gun
...
- Gives Advanced Energy Gun a taser mode.
- Allows them to accept Seclites.
2015-09-10 11:27:30 -05:00
5a5bcbbbd7
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
code/game/gamemodes/changeling/powers/mutations.dm
2015-09-10 23:18:39 +08:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
98aef2ee6a
ExtraValueRemoved
2015-09-10 14:10:48 +08:00
6eac77fcfd
Rifle
2015-09-10 13:14:41 +08:00
f587588eb9
Merge pull request #11636 from duncathan/lol
...
distro fix + fixes runtimes
2015-09-09 20:37:51 -03:00
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
1d9b59e28b
Fixes missing chem heater board design
...
- Fixes #11673 (deleted a tab)
2015-09-09 12:53:00 -05:00
b238ac02e8
Xeno tweaks and bugfixes.
2015-09-09 17:54:59 +01:00
fbbdbe17ed
Merge pull request #11666 from tgstation/Fixing_bugs_from_browser_with_edit_button
...
Fixes blood mixing not merging symptoms properly
2015-09-09 12:48:52 -03:00
304d91fa2c
Merge pull request #11606 from Firecage/gunnames
...
This gives most projectile guns less generic names.
2015-09-09 10:45:18 -05:00
2a90cd109e
Stetchkin pistol rename.
2015-09-09 17:36:14 +02:00
c40dea1ebd
Removes src and renames the argument
...
Removes src and renames the argument
2015-09-09 16:36:40 +03:00
b86464f573
woo more runtimes
2015-09-08 22:59:18 -06:00
81e2af9c8a
MinorAntagArmourBuff
2015-09-09 12:00:46 +08:00
d45890b4df
Merge branch 'master' of https://github.com/tgstation/-tg-station into GunsEdition
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-09 11:47:44 +08:00
44033427a9
Merge pull request #11630 from bgobandit/slimepotionfixfuck
...
Fixes/tweaks slime potions.
2015-09-08 20:11:31 -05:00
dbcc6aeed8
Merge pull request #11650 from optimumtact/patch-9
...
Better error messages for start game verb
2015-09-08 20:06:14 -05:00
524186e4db
Merge pull request #11569 from Anonus/blobchemtweaks
...
Changes blob chemicals
2015-09-09 02:44:34 +03:00
161156cffc
Merge pull request #11585 from bgobandit/legitposters
...
Poster changes!
2015-09-09 02:38:56 +03:00
54a58ddbf5
Fixes blood mixing not merging symptoms properly
...
Fixes blood mixing not merging symptoms properly
Fix #11482
2015-09-09 01:46:04 +03:00
f1b1f4caa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceTravel
2015-09-08 21:58:19 +03:00
e2a25060cc
Use defines instead of magic
...
Use defines instead of magic
2015-09-08 21:58:05 +03:00
a62c09bbb7
Merge remote-tracking branch 'upstream/master' into dryshoes
...
Conflicts:
code/__DEFINES/misc.dm
2015-09-08 16:56:37 +01:00
bear1ake
Steelpoint
Menshin
Fox-McCloud
Razharas
Aranclanos
Remie Richards
Marc R. Uchniat
phil235
xxalpha
Kyle Spier-Swenson
bgobandit
Incoming
GunHog
Cheridan
Firecage
duncathan
Razharas