Jordie
94de5c997e
Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
...
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
Razharas
a67d8339b7
Merge pull request #8414 from phil235/TablecraftVarietyFix
...
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
GunHog
31c5e648f4
Secbots now require Sec helmets
...
Only Sec helmets with a camera and no flashlight can be used to create a
securitron assembly.
2015-03-21 17:10:55 -05:00
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
xxalpha
920f97608a
Fixed bugs.
2015-03-21 11:53:54 +00:00
GunHog
4659724851
Mini-Fix for flashlighting invalid helmets
...
I am going to expand on it later.
2015-03-21 02:52:05 -05: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
Iamgoofball
829045231b
fixes shit
2015-03-20 23:41:55 -07:00
Jordie
c4f7ee6196
Merge pull request #8233 from Iamgoofball/patch-44
...
Meth no longer breaks the space time continuum.
2015-03-21 17:23:55 +11:00
Iamgoofball
08b3f3b6d4
fixes descriptions
2015-03-20 22:26:05 -07: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
Iamgoofball
a2cb917473
initro tweaks
2015-03-20 22:03:03 -07:00
Iamgoofball
65b0bf7a14
new colors for smoke, flash, and sonic powder
2015-03-20 21:12:20 -07:00
Iamgoofball
26c407ec91
removes outdated comments
2015-03-20 20:17:19 -07:00
xxalpha
d9921411b8
Changed anti-drop implant emp_act(). Added designs to mech fabricator.
2015-03-21 00:17:27 +00:00
xxalpha
69d4536844
Code tweaks. Designs are now in 'Medical'.
2015-03-20 22:57:52 +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
GunHog
46ca095f2b
Tweaks and fixes
...
- You can now make Securitrons with Sec helmets.
- Helmet cameras now function as borg cameras do. They will update the
chunk on the next game tick, if the camera is moved.
- Helmet cameras are now vulnerable to EMP (camera alarm is not
triggered)
- Removed the extra canAttachCam lines.
- Paid my tithe to Lord of Changelogs.
2015-03-20 09:39:50 -05:00
GunHog
e1668e985f
Attachable Seclite & Camera to Helmet
...
Steals #8109
2015-03-19 23:40:37 -05: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
Iamgoofball
f0f5eb7543
Reverts the turf checks on clf3 due to #8437 fixing the underlying issue
2015-03-19 20:09:04 -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
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
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
Iamgoofball
0b551856b0
Makes flash and sonic powder effects scale their range based on the amount set off.
2015-03-18 21:07:38 -07: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
