d3d491588e
Cleaned up the functionality and prepared things for PR.
2015-03-20 23:19:19 +00:00
57f544ffdf
Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff.
2015-03-20 23:19:04 +00:00
a030c9889e
Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check.
2015-03-20 23:03:06 +00:00
b758992e8c
First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.
2015-03-20 23:02:53 +00:00
69d4536844
Code tweaks. Designs are now in 'Medical'.
2015-03-20 22:57:52 +00:00
92684d7717
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
2015-03-20 22:26:23 +01:00
48bbf303da
Fix conflict in xenobiology.dm
...
Simplify simple_animal/attackby()
more work on slimes.
2015-03-20 22:05:09 +01:00
41cb54b8f4
Remove xylophone skeleton ribcage playing
2015-03-20 12:10:52 -07:00
8bb7b3b50f
MINE IS THE DRILL THAT WILL PIERCE THE HEAVENS
...
added meson gar glasses to mining vendor
made gar glasses names consistent
2015-03-20 14:45:39 -04:00
0ad731d057
Merge pull request #8344 from MMMiracles/bearfood
...
Adds 3 new bear-related foods.
2015-03-20 19:45:00 +01:00
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
182a3da16a
More work on slimes. Moving xenobiology items to modules/research/xenobiology
2015-03-20 19:17:03 +01:00
c25576ad6a
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00:00
9e25fe4019
Merge pull request #8431 from AnturK/lawsupdated
...
Adds total law changes counter
2015-03-20 17:46:44 +01:00
57aadcc7fb
Merge pull request #8424 from phil235/SiliconWeldProtFix
...
Fixes silicons being flashed when welding.
2015-03-20 17:46:16 +01:00
d95209a5df
Merge pull request #8391 from Incoming5643/Statue_of_limitations
...
Fixes invincible unstoppable death statues
2015-03-20 17:43:22 +01:00
517e1f9c83
Merge pull request #8418 from Incoming5643/Absolute_territory
...
Adds absolute territory
2015-03-20 17:10:41 +01:00
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
29477dfccc
adds GAR glasses of various flavors
...
you're welcome
2015-03-20 01:29:54 -04:00
e1668e985f
Attachable Seclite & Camera to Helmet
...
Steals #8109
2015-03-19 23:40:37 -05:00
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
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
Fayrik
xxalpha
phil235
MrPerson
dannno
Swag McYolosteinen
GunHog
Remie Richards
Iamgoofball
MMMiracles
AnturK
Jordie
Cheridan
Incoming