Commit Graph

7740 Commits

Author SHA1 Message Date
Ergovisavi 9e6cd7fba5 Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs
Some more AI behavior var tweaks
2014-01-21 22:59:46 -08:00
Ergovisavi 64fa80de7f More hostile mob work with behavior vars, getting rid of idle_env_destroyer nobody uses it, other tweaks 2014-01-21 22:15:28 -08:00
Cheridan 290180dec8 Merge pull request #2387 from MrPerson/Animation_OLD
Mobs use animate() to rotate
2014-01-21 20:39:12 -08:00
Cheridan b583b83608 Merge pull request #2466 from Incoming5643/slimetime
Slime refactoring fixes
2014-01-21 20:17:00 -08:00
Incoming eb8454006f Fixes dark purple, dark blue, and light pink slimes not working right because of their spaces 2014-01-21 20:00:30 -05:00
MrPerson 9058921972 Merge branch 'master' of https://github.com/tgstation/-tg-station into Animation_OLD
Conflicts:
	code/game/objects/items/weapons/shields.dm
	code/modules/events/ninja.dm
	code/modules/mob/living/carbon/human/update_icons.dm

No more cloakers, no more cloak_stacks. Also removed that silly "I'll make an icon and then make an image of that icon" bullshit.
2014-01-21 15:19:27 -08:00
Pete Goodfellow 9a8edff524 Merge fix. Updated to MetaStation.v39B.II.dmm 2014-01-21 21:57:10 +00:00
Pete Goodfellow d80719c330 Merge branch 'tg-mapchange' of github.com:Mloc/-tg-station into mapsss
Conflicts:
	_maps/RandomZLevels/fileList.txt
	_maps/map_files/MetaStation.v39A.III.dmm
	maps/MetaStation.v39A.III.dmm
	maps/MetaStation.v39B.II.dmm
	tgstation.dme
2014-01-21 21:50:32 +00:00
JJRcop 0e45022798 Resolved more conflicts with drying rack before being pulled
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
Incoming bb767ead76 Another minor fix to the slime refactor commit. Splitting adult slimes weren't surviving correctly. Revive to the rescue. 2014-01-20 23:08:59 -05:00
Ergovisavi eb8924d80c Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc 2014-01-20 17:36:06 -08:00
Cheridan e0680a509e Merge pull request #2449 from Razharas/SlimesAndWindows
Fixes metr-err- i mean slimes
2014-01-20 17:25:31 -08:00
Incoming a0752b8665 Fixes an oversight in slime reproduction 2014-01-20 18:20:12 -05:00
Pete Goodfellow e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
fleure 17ba1e20d6 Merge pull request #2429 from Razharas/master
Fixes air alarms being undeconstructable
2014-01-20 11:23:02 -08:00
fleure ad49512b4e Merge pull request #2440 from Petethegoat/suicideformat
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-20 11:11:23 -08:00
fleure d6964e703d Merge pull request #2442 from Alek2ander/master
Logs, logs everywhere
2014-01-20 11:08:57 -08:00
fleure f3ca9c0c2c Merge pull request #2446 from Petethegoat/walkspeed
Speeds up walking from 7 delay to 4.
2014-01-20 10:54:36 -08:00
Pete Goodfellow a462177c8e Adjusts movement_delay() for aliens, to use inheritance!
Speeds up drones, they are now the same speed as sentinels.
2014-01-20 18:31:57 +00:00
fleure c73f6f7eec Merge pull request #2445 from Razharas/AbstractNonsense
Fixes the admin notice thingie
2014-01-20 10:27:47 -08:00
Cheridan 9cbb9bb403 Merge pull request #2434 from johnsmith38/master
Black Baseball Caps [FIXED]
2014-01-19 20:21:40 -08:00
Cheridan 70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
Razharas 63e9192fe7 Fixes metr-err- i mean slimes
Fixes #225
2014-01-20 02:29:36 +04:00
Pete Goodfellow fd4df85045 Changed legcuffs to use slowdown instead of forcing the user to walk. 2014-01-19 20:17:23 +00:00
Pete Goodfellow 9df2455cfb Speeds up walking from 7 delay to 4. Removes the hardcoded walk/running delays, and uses the config options instead. 2014-01-19 19:44:11 +00:00
Alek2ander ecf50f2de8 Goodbye nuke 2014-01-19 22:15:28 +04:00
Razharas 2254ad4cb6 Fixes the admin notice thingie
Fixes #2427
2014-01-19 22:05:35 +04:00
Alek2ander 9fa38637ad Logs everywhere
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
2014-01-19 21:16:30 +04:00
Pete Goodfellow af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
Pete Goodfellow 5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
fleure 6102e1f7ff Merge pull request #2417 from lokxy/master
Fixes issue #1828 (Wizard Perma-Mutate)
2014-01-19 03:56:46 -08:00
fleure 5f8314c5e4 Merge pull request #2420 from hornygranny/bomblog
Syndicate bomb logging
2014-01-19 03:50:21 -08:00
fleure 05e96e477d Merge pull request #2424 from RobRichards1997/18/01/2014-Cyborg-Debraining
Fixes not being able to debrain augmented humans
2014-01-19 03:42:57 -08:00
John Smith a3e94d74e9 Black Baseball Caps [FIXED] 2014-01-19 00:35:10 -08:00
MrPerson adbb273221 Merge pull request #2419 from KazeEspada/goodbyespaceworms2014
removes space worms
2014-01-18 23:24:22 -08:00
lokxy 12998c0641 Fixes issue #1828 (Wizard Perma-Mutate)
Fixes Issue #1828 (Wizard Perma-Mutate)
- added centcomm check
2014-01-19 03:13:17 +01:00
fleure cd5fb384f0 Merge pull request #2409 from Rolan7/Issue112_Powersinks
Fixes Issue 112, APCs not charging
2014-01-18 17:30:02 -08:00
fleure 4efa6b3114 Merge pull request #2412 from Razharas/BorgAndGhostClickDragInventory
Fixes borgs and ghosts storages
2014-01-18 17:29:44 -08:00
fleure 41af5a264f Merge pull request #2414 from Razharas/BorgsMASTA!!--SPAAAAAAAAAAAAAAAKU!!
Fixes borgs sparking when hit with 0 damage items
2014-01-18 17:28:52 -08:00
fleure 65729c6500 Merge pull request #2418 from hornygranny/necrophilia
Animal necrophilia removed
2014-01-18 17:23:58 -08:00
fleure e52c7106fb Merge pull request #2416 from Razharas/AutolatheFix
Fixes autolathe checking wrong value
2014-01-18 16:47:57 -08:00
fleure e51027dbbb Merge pull request #2413 from hornygranny/sheetfixes
Fixed typos in metal sheets/light tiles
2014-01-18 16:00:34 -08:00
MrPerson 5f1b76dd99 Lock aliens lying to 90 degrees.
Make them use the sleep sprites when unconscious.

Lock mobs laying down to either NORTH or SOUTH.
2014-01-18 13:41:43 -08:00
Giacom 3a77ff99f7 Merge pull request #2407 from hornygranny/chameleonfix
Chameleon jumpsuit fix
2014-01-18 12:29:44 -08:00
Cheridan b4f1e03341 Merge pull request #2285 from ChuckTheSheep/Botany
Irrigation Botany Changes
2014-01-18 12:12:38 -08:00
Razharas 5b16946a83 Added comment by Gias request
Yep
2014-01-18 21:06:59 +04:00
Razharas 24c2548ec5 Fixes air alarms being undeconstructable
Fixes #2339
2014-01-18 21:06:58 +04:00
Robson Richards 0af17afec7 fixes not being able to debrain augmented humans 2014-01-18 12:26:00 +00:00
Cheridan da0abda348 Merge pull request #2400 from hornygranny/summonlogging
Summon guns/magic logging
2014-01-17 23:02:46 -08:00
Cheridan 9468c30e05 Merge pull request #2374 from tgstation/501
Merging 501 with Master.
2014-01-17 21:33:46 -08:00