721b81373a
Removed commented out regenerate_icons()
2015-03-19 21:35:24 -07:00
f0f5eb7543
Reverts the turf checks on clf3 due to #8437 fixing the underlying issue
2015-03-19 20:09:04 -07:00
de9641edae
seriously where did these lines come from
2015-03-19 19:35:02 -04:00
46a824c5cc
againwhy?
2015-03-19 19:34:36 -04:00
9ed41e0510
lineswhy
2015-03-19 19:34:16 -04:00
ae42b04999
Merge branch 'master' of https://github.com/tgstation/-tg-station into bearfood
...
Conflicts:
code/modules/food&drinks/food/snacks_burgers.dm
code/modules/food&drinks/food/snacks_meat.dm
code/modules/food&drinks/food/snacks_pie.dm
2015-03-19 16:06:13 -04:00
179c62a84a
conflicts harharhar
2015-03-19 16:02:50 -04:00
49a3cea290
Fixes #8168 for real.
2015-03-19 20:53:21 +01:00
c4892765db
Makes the sayspan rewrite not runtime everything to fuck.
...
Also fixes #8168
2015-03-19 20:42:33 +01:00
a9b18759f2
Fixed HUD examine features.
2015-03-19 19:41:05 +00:00
7cccf20fc0
Adds total law changes counter
2015-03-19 14:57:12 +01:00
0a3dea39c8
Merge pull request #8343 from Incoming5643/Follow_me_if_you_want_to_live
...
Docile slime AI won't try to break your pull
2015-03-19 16:46:45 +11:00
329765618d
Merge pull request #8365 from Incoming5643/What_Do_You_Mean_You_Didn't_Want_To_Be_A_Dog
...
Adds a little consent system for sentience potions
2015-03-19 16:45:26 +11:00
e924c9f97f
Merge pull request #8374 from phil235/FoodSpawnFix
...
Fixes spawned food not having any nutriment.
2015-03-19 16:45:15 +11:00
0cdd34ee05
Merge pull request #8354 from MMMiracles/hardsuit_upgrade
...
Revamps ERT suits to use helmet toggle
2015-03-19 16:45:05 +11:00
6b946c1158
Merge pull request #8399 from Menshin/mech_guns_tidying
...
Unified mechs energy and ballistics guns firing proc
2015-03-19 16:44:54 +11:00
d4a602802b
Merge pull request #8394 from phil235/CritBlindFix
...
Fixes lack of blindness when in crit.
2015-03-19 16:44:46 +11:00
af6464d8bf
Merge pull request #8223 from phil235/MimanaFix
...
Mimana fix
2015-03-19 16:44:29 +11:00
b2953d71c7
Merge pull request #8263 from dannno/glasses
...
cosmetic glasses n shit
2015-03-19 16:44:20 +11:00
97a0d1ce07
Merge pull request #8381 from GunHog/NoMoreLightGrenades
...
Minor Experimentor relic tweaks
2015-03-19 16:44:08 +11:00
e5fdddc7d8
Merge pull request #8289 from Xhuis/alt_clicking
...
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
f180506a2d
finished
2015-03-18 23:59:23 -05:00
0b551856b0
Makes flash and sonic powder effects scale their range based on the amount set off.
2015-03-18 21:07:38 -07:00
b7adce753a
Fixes unreported bug with clf3, changes the brainloss in heart attack to do 1 brute instead of 10 brain, makes health scanners show heart attacks.
2015-03-18 20:33:03 -07:00
c9312a6ab7
Fixes silicons being flashed when welding. Silicons and repair drones now have eye protection like aliens. This means flashers and flashbangs no longer flash them, but flashbang still weaken them, and lasers and handheld flashes still work on them.
2015-03-19 04:04:44 +01:00
7149f0382d
Adds Pet Collars!
...
Map needs update now
2015-03-18 21:27:21 -05:00
3607b645af
Reverts the goonchem pathing. It is back to /datum/reagent now.
2015-03-18 19:22:11 -07:00
563b65e9d4
adds a tiny little personal fix for female outfit generation now that people are using alt styles in this way
2015-03-18 19:16:45 -04:00
0d2837935b
Adds absolute territory
2015-03-18 17:13:50 -04:00
31de411a11
Merge remote-tracking branch 'upstream/master' into cyberimplants
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/mob_defines.dm
2015-03-18 20:11:51 +00:00
1b753dd1c5
Adds the comic sans span to the new system.
2015-03-18 21:09:36 +01:00
9b419d26f0
Fixes not being able to tablecraft recipes using different types of an item for a requirements (e.g. two types of cutlets to make a meat pizza).
...
Fixes mushroom requirements in tablecraft recipes appearing as "snacks" in the requirement lists.
Reduces the chem puff waiting time when spraying at short range, so it takes less time before it reacts with a turf/mob/object.
2015-03-18 20:57:30 +01:00
3f64d2def3
Re-adds robot span classes.
2015-03-18 20:38:57 +01:00
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
edccabb0c4
Only engineering type hardsuits have the inbuilt jetpack.
2015-03-18 17:48:45 +00:00
e9a36f4d53
Fixes character appearances - no more bald albinos
...
Fixes #8383
Also removed two defunct comments.
2015-03-18 02:21:56 -07:00
bf4476a041
Merge remote-tracking branch 'remotes/upstream/master' into bearfood
...
Conflicts:
icons/obj/food.dmi
2015-03-17 22:39:03 -04:00
ca9f31a0e3
* Unified the firing proc for energy and ballistics mech guns
...
* Fixes incendiaries bullets runtiming on qdel
2015-03-17 23:58:03 +01:00
94e683885b
The uplifted simple mob will now only lose its neutral faction, keeping them safe from other creatures of the same type
2015-03-17 16:40:38 -04:00
0a0d946848
Fixes lack of blindness when in crit.
2015-03-17 21:24:16 +01:00
8fa8919e2e
Added a comment, removed unnecessary line.
2015-03-17 19:41:58 +00:00
6f5ea7f5e7
Adds embedded jetpacks to hardsuits.
2015-03-17 18:42:29 +00:00
612ededfd0
Removes factions from sentient mobs, as they both don't need them being player contr and it leads to some really exotic bugs.
...
Fixes an unreported bug where statues could bleed out
2015-03-17 14:26:05 -04:00
f0731d01e2
changelog compiled
2015-03-17 20:03:31 +11:00
cb9d49ab02
Merge pull request #8359 from xxalpha/stackfix
...
Fixes several zero amount stack bugs.
2015-03-17 17:10:04 +11:00
d40efa9cd8
fixes the recipe
2015-03-16 21:14:32 -07:00
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07:00
8701459651
Fixes and changelog update
2015-03-16 20:46:51 -07:00
6032c3d966
Minor Experimentor relic tweaks
...
- Nerfs the explosion relic so it can only explode once.
- The PetSpray relic now has a chance to destroy itself on use.
- Prevents the Experimentor re-rolling the function of a relic.
- Added low priority logging for the rest of the relics.
- Fixed the relic messages not showing to the user.
2015-03-16 15:57:29 -05:00
f7be7fb711
Merge pull request #8377 from Miauw62/AAAAA
...
Fixes #8375
2015-03-16 19:26:26 +00:00
MrPerson
Iamgoofball
MMMiracles
Miauw
xxalpha
AnturK
Jordie
Cheridan
phil235
Incoming
Menshin
GunHog
Remie Richards