Remie Richards
819422bc3e
Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
...
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
Swag McYolosteinen
0ad731d057
Merge pull request #8344 from MMMiracles/bearfood
...
Adds 3 new bear-related foods.
2015-03-20 19:45:00 +01:00
xxalpha
c25576ad6a
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00:00
Swag McYolosteinen
9e25fe4019
Merge pull request #8431 from AnturK/lawsupdated
...
Adds total law changes counter
2015-03-20 17:46:44 +01:00
Swag McYolosteinen
57aadcc7fb
Merge pull request #8424 from phil235/SiliconWeldProtFix
...
Fixes silicons being flashed when welding.
2015-03-20 17:46:16 +01:00
Swag McYolosteinen
d95209a5df
Merge pull request #8391 from Incoming5643/Statue_of_limitations
...
Fixes invincible unstoppable death statues
2015-03-20 17:43:22 +01:00
Swag McYolosteinen
517e1f9c83
Merge pull request #8418 from Incoming5643/Absolute_territory
...
Adds absolute territory
2015-03-20 17:10:41 +01:00
Remie Richards
5b18ed7c2e
Merge pull request #8403 from MrPerson/no_bug_here
...
Fixes character appearances - no more bald albinos
2015-03-20 04:36:32 +00:00
MrPerson
721b81373a
Removed commented out regenerate_icons()
2015-03-19 21:35:24 -07:00
MMMiracles
de9641edae
seriously where did these lines come from
2015-03-19 19:35:02 -04:00
MMMiracles
46a824c5cc
againwhy?
2015-03-19 19:34:36 -04:00
MMMiracles
9ed41e0510
lineswhy
2015-03-19 19:34:16 -04:00
MMMiracles
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
MMMiracles
179c62a84a
conflicts harharhar
2015-03-19 16:02:50 -04:00
Miauw
49a3cea290
Fixes #8168 for real.
2015-03-19 20:53:21 +01:00
Miauw
c4892765db
Makes the sayspan rewrite not runtime everything to fuck.
...
Also fixes #8168
2015-03-19 20:42:33 +01:00
AnturK
7cccf20fc0
Adds total law changes counter
2015-03-19 14:57:12 +01:00
Jordie
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
Jordie
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
Jordie
e924c9f97f
Merge pull request #8374 from phil235/FoodSpawnFix
...
Fixes spawned food not having any nutriment.
2015-03-19 16:45:15 +11:00
Jordie
0cdd34ee05
Merge pull request #8354 from MMMiracles/hardsuit_upgrade
...
Revamps ERT suits to use helmet toggle
2015-03-19 16:45:05 +11:00
Jordie
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
Jordie
d4a602802b
Merge pull request #8394 from phil235/CritBlindFix
...
Fixes lack of blindness when in crit.
2015-03-19 16:44:46 +11:00
Jordie
af6464d8bf
Merge pull request #8223 from phil235/MimanaFix
...
Mimana fix
2015-03-19 16:44:29 +11:00
Jordie
b2953d71c7
Merge pull request #8263 from dannno/glasses
...
cosmetic glasses n shit
2015-03-19 16:44:20 +11:00
Jordie
97a0d1ce07
Merge pull request #8381 from GunHog/NoMoreLightGrenades
...
Minor Experimentor relic tweaks
2015-03-19 16:44:08 +11:00
Jordie
e5fdddc7d8
Merge pull request #8289 from Xhuis/alt_clicking
...
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
phil235
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
Incoming
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
Incoming
0d2837935b
Adds absolute territory
2015-03-18 17:13:50 -04:00
Miauw
1b753dd1c5
Adds the comic sans span to the new system.
2015-03-18 21:09:36 +01:00
Miauw
3f64d2def3
Re-adds robot span classes.
2015-03-18 20:38:57 +01:00
Miauw
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
MrPerson
e9a36f4d53
Fixes character appearances - no more bald albinos
...
Fixes #8383
Also removed two defunct comments.
2015-03-18 02:21:56 -07:00
MMMiracles
bf4476a041
Merge remote-tracking branch 'remotes/upstream/master' into bearfood
...
Conflicts:
icons/obj/food.dmi
2015-03-17 22:39:03 -04:00
Menshin
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
Incoming
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
phil235
0a0d946848
Fixes lack of blindness when in crit.
2015-03-17 21:24:16 +01:00
Incoming
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
Jordie0608
f0731d01e2
changelog compiled
2015-03-17 20:03:31 +11:00
Jordie
cb9d49ab02
Merge pull request #8359 from xxalpha/stackfix
...
Fixes several zero amount stack bugs.
2015-03-17 17:10:04 +11:00
GunHog
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
Remie Richards
f7be7fb711
Merge pull request #8377 from Miauw62/AAAAA
...
Fixes #8375
2015-03-16 19:26:26 +00:00
Swag McYolosteinen
670aac5785
Should properly unfuck savefiles
2015-03-16 20:12:09 +01:00
Swag McYolosteinen
5242a08a2b
Fixes #8375
...
UNTESTED I DONT KNOW WHAT IS GOING ON AAAAAAA
2015-03-16 20:03:05 +01:00
phil235
b87300e712
Fixes donuts not having a uniquee filling color
2015-03-16 19:51:06 +01:00
phil235
41279b3c03
Fixes spawned food not having normal amounts of nutriment and other reagents.
...
Upgraded microwave now adds more nutriment, vitamin and other reagents to the food it cooks.
2015-03-16 18:47:01 +01:00
Jordie
9c148ff13e
Merge pull request #8315 from phil235/BigUserdanger
...
Makes the message when you're attacked slightly bigger
2015-03-16 18:30:21 +11:00
Jordie
fb6aa85094
Merge pull request #8274 from Thunder12345/techshellening
...
Shotgun party, new shells, an improvement and a fix
2015-03-16 18:30:14 +11:00
Incoming
1d9d781b59
Adds a little consent system for sentience potions
...
Fixes an unreported runtime
2015-03-15 20:54:36 -04:00
