Swag McYolosteinen
e9f21c3b28
Merge pull request #8462 from xxalpha/cyberimplants
...
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
xxalpha
3888013a43
Changed flag list to flag var.
2015-03-21 12:24:27 +00:00
Swag McYolosteinen
afa1b76cde
Merge pull request #8190 from xxalpha/cyberimplants
...
Cybernetic Implants
2015-03-21 13:19:26 +01:00
Razharas
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
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
xxalpha
69d4536844
Code tweaks. Designs are now in 'Medical'.
2015-03-20 22:57:52 +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
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
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
xxalpha
a9b18759f2
Fixed HUD examine features.
2015-03-19 19:41:05 +00: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
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
Iamgoofball
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
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
xxalpha
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
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
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
Iamgoofball
7600697c13
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-03-16 21:13:56 -07:00
Incoming
1d9d781b59
Adds a little consent system for sentience potions
...
Fixes an unreported runtime
2015-03-15 20:54:36 -04:00
phil235
78d28a6d64
Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
...
Conflicts:
code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
phil235
e3e881e6ee
Merge branch 'master' of https://github.com/tgstation/-tg-station into MimanaFix
...
Conflicts:
code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
2015-03-15 12:27:40 +01:00
Cheridan
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
Iamgoofball
d0f101cd37
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-03-14 21:32:13 -07:00
Cheridan
8e2962c4ab
Merge pull request #8255 from GunHog/SiliconVerbFix
...
Fixes "Sensor Augmentation" showing in silicon verbs
2015-03-14 23:08:19 -05:00
Cheridan
0b7be73f62
Merge pull request #8286 from phil235/SteelcapFix
...
Steel cap, sandstone and welding fixes plus flashing refactor
2015-03-14 22:56:37 -05:00
Iamgoofball
7114d5ac04
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Goon-Medicine.dm
2015-03-14 20:00:35 -07:00
Cheridan
1027c7619c
Merge pull request #8206 from RemieRichards/AILessProcessing
...
Hostile Mob AI Optimisation
2015-03-14 16:21:22 -05:00
Cheridan
52dfa42eb5
Merge pull request #8257 from phil235/ReflectFix
...
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
Incoming
05718664cf
Docile slime AI won't try to break your pull when you pull them
2015-03-14 13:43:33 -04:00
Cheridan
f70084ecab
Merge pull request #8227 from phil235/HulkCritFix
...
Hulk crit fixes
2015-03-13 22:56:51 -05:00
Cheridan
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
Cheridan
9c3ed3da04
Merge pull request #8247 from Incoming5643/Welcome_to_ireland
...
Explicitly passes a mobs mutant_color in blood samples
2015-03-13 15:22:14 -05:00
hornygranny
875313be9e
Merge pull request #8279 from MrPerson/pull_rapidemente_ariba_ariba_vamanos
...
Pulling icon en-speedening
2015-03-13 12:22:17 -07:00
MrPerson
9038fb15af
Code cleanup
...
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
Cheridan
28f6aae00c
Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
...
Conflicts:
icons/mob/back.dmi
remie is a nerd btw
2015-03-12 20:47:11 -05:00
phil235
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
phil235
1eba7b694b
Merge pull request #8134 from Miauw62/ghostradios
...
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
phil235
60e152c54e
slight adjustments..
2015-03-10 20:43:21 +01:00
phil235
7ba8af5222
Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
...
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01:00
