ed2858c2e2
Merge pull request #11737 from xxalpha/itsakindofmagic
...
Fixed eye wear overriding see_invisible when it shouldn't.
2015-09-13 17:27:19 +02:00
ac41b600ce
Merge pull request #11718 from phil235/TableClimbingFixes
...
Tableclimbing & reagent runtime fixes
2015-09-13 17:26:33 +02:00
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
3e6f0c87bf
Merge pull request #11731 from Fox-McCloud/Impropermaterials
...
Fixes Consistency Issue with Materials
2015-09-13 23:13:22 +10:00
e718214a67
Merge pull request #11734 from Menshin/sheets_inserting_safety_checks
...
Adds boundary checks for stack sheets inserting
2015-09-13 23:13:04 +10:00
9b668de7bb
Merge remote-tracking branch 'upstream/master' into Impropermaterials
2015-09-13 08:58:40 -04:00
5783cdda03
Merge branch 'master' of https://github.com/tgstation/-tg-station into RifleS
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-13 20:00:41 +08:00
77911b67ba
Merge pull request #11709 from bgobandit/fuckyouslimesfuckfuckfuck
...
Fixes pink slime potions.
2015-09-13 21:59:08 +10:00
a4549ee9b3
Merge pull request #11727 from Aranclanos/goliathstentacles
...
Fixes goliath tentacles not deleting themselves
2015-09-13 21:56:22 +10:00
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
6c8bb6f518
Merge pull request #11632 from bgobandit/dirtymininglies
...
Fixes asteroid turfs showing up as "mineral deposit."
2015-09-13 21:45:56 +10:00
5a34de7bd3
Merge pull request #11699 from Incoming5643/dirtyspaceman
...
Fixes lizard looking odd with helmets
2015-09-13 21:45:44 +10:00
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
f02589180d
Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem
...
Added a taser function back to the Advanced Energy Gun
2015-09-13 21:42:45 +10:00
265dadea68
Fixes #11752 , resets CLF3's metab. rate to 4u instead of 0.5u
...
@phil235 you forgot to keep it at 4u, which is why CLF3 does so much damage over time
it's supposed to do a lot of damage but metabolize really really fast
you accidentally made it do a lot of damage but metabolize really slowly
2015-09-12 21:31:00 -07:00
89ce4e112d
Stored the material name in case the stack was deleted after the sleep() when dealing with overlays.
2015-09-13 01:57:21 +02:00
815ef798e9
Fixes the last remaining associative lists from pipes
2015-09-12 20:57:16 -03:00
cf2d0903f6
Added a new formal jacket to the captain's locker
2015-09-12 21:10:16 +01:00
16ac3baa88
made confusion directional and probabilistic
2015-09-12 13:15:45 -06:00
cb6bb99318
Readds the chest augmentation organ to the augmentation surgery, humans won't walk around chestless anymore.
2015-09-12 15:07:29 -03:00
701a5c7949
Fixed eye wear overriding see_invisible when it shouldn't.
...
minmax
2015-09-12 17:34:03 +01:00
de156015b7
Removed the silver cost from techshells
2015-09-12 14:46:41 +01:00
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
Swag McYolosteinen
Jordie
Fox-McCloud
Steelpoint
Iamgoofball
Menshin
Aranclanos
Thunder12345
unknown
xxalpha
bear1ake
Razharas
Remie Richards
Marc R. Uchniat
phil235
Kyle Spier-Swenson
bgobandit
Incoming
GunHog