Commit Graph

6285 Commits

Author SHA1 Message Date
hornygranny 45b2ed0d0e Merge pull request #5248 from Jordie0608/helpimbeingoppressedbycode
Remove del-alls list of safes
2014-10-20 19:34:29 -07:00
hornygranny afe171bb0a Merge pull request #5313 from TZK13/Preferences-Setup-Fixes
Fixes the previews in the character setup screen
2014-10-20 19:32:48 -07:00
hornygranny 9e2dc67e86 Merge pull request #5363 from Cheridan/better_noms
Anomaly Event Changes
2014-10-20 19:24:04 -07:00
hornygranny d74690a7bf Merge pull request #5308 from Menshin/radiation_decreasing_fix
Fixes radiation levels getting stuck
2014-10-20 19:20:19 -07:00
hornygranny 18c669a4fc Merge pull request #5364 from JJRcop/Reactivated-drones-still-in-dead-mob-list
Fixes a bug with reactivated drones not being removed from the dead_mob_list
2014-10-20 19:19:45 -07:00
hornygranny 6b108a6c6b Merge pull request #5367 from paprka/rollinfix
Fixes jumpsuit rolling for random jumpsuits
2014-10-20 19:17:56 -07:00
Remie Richards b7de714fa7 Merge pull request #5257 from Incoming5643/WhatAJobber
Manage Free Slots
2014-10-20 14:35:18 +01:00
Cheridan c67052b58d Merge pull request #5200 from PatchouliKnowledge/Phazons
Lots of mecha changes and additions.
2014-10-20 01:27:50 -05:00
Cheridan 3fd1b8629c Merge pull request #5347 from RemieRichards/LabcoatSwitchFix
Labcoat toggle() unfuck
2014-10-20 01:04:09 -05:00
Cheridan 455b526cc1 Merge pull request #5318 from phil235/MsgFix2
More messages fixed
2014-10-19 21:39:06 -05:00
Cheridan c5ed446f24 Merge pull request #5300 from phil235/DroneArrestFix
Fix for #5281
2014-10-19 18:54:33 -05:00
paprka 497bb10e26 fixes jumpsuit rolling for random jumpsuits 2014-10-19 16:14:38 -07:00
Cheridan 4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher
Fixes cyborgs being able to add their flashes to things
2014-10-19 17:44:30 -05:00
JJRcop 86287072ec Fixes a bug when reactivating drones where they wouldn't be removed from the dead_mob_list 2014-10-19 18:15:18 -04:00
Cheridan f52d3e8c69 Anomaly Event Changes
Increases the duration and occurrence rate of Anomaly events.
Anomaly cores now give better research values.
Bluespace anomalies no longer teleport anchored objects because it looks godawful.

If not defused, Pyroclastic Anomalies will create a red or orange slime.
2014-10-19 17:07:07 -05:00
xxalpha d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
Remie Richards 7ae1a6f634 Replaces horrific switch() on labcoats in labcoat.dm, each labcoat HAND TESTED to ensure icons still work 2014-10-19 03:47:28 +01:00
paprka ebeba833e7 reverts wizard jumpsuit stuff 2014-10-18 19:31:56 -07:00
paprka a88da6dc11 wizard repathing and jumpsuit code fixes 2014-10-18 14:43:28 -07:00
paprka c7dd1dc133 hotfix for some clothing bugs 2014-10-18 14:00:08 -07:00
Swag McYolosteinen 003351ae77 Merge pull request #5231 from Jordie0608/thesetypofixesdedicatedtoshakespeare
[MAP] Adds riot shotgun for spawn in armory
2014-10-18 16:47:13 +02:00
phil235 9b9481d65c Changes many span classes.
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
TZK13 4c5dcb4ae9 Changes the preview satchel for the CMO, MD and virologist from norm to med. 2014-10-18 04:55:40 -05:00
TZK13 3cff2fcbdd Fixes the previews in the character setup screen. 2014-10-18 04:30:10 -05:00
Menshin 98a7b97377 Fixes radiation levels getting stuck between 0-1, 49-50 and 75-76 (fixes #5304) 2014-10-18 01:10:38 +02:00
PatchouliKnowledge bb190861bf Goliath plates are now NOBLUDGEON 2014-10-18 00:03:01 +03:00
Cheridan 05f63d6181 Merge pull request #5238 from paprka/removegreyshirt
Adds random jumpsuit colors for assistants
2014-10-17 14:34:58 -05:00
phil235 5159889153 Fixes secbot hunting, stunning and arresting maintenance drones that attack them. Secbot won't hunt them anymore, just like with silicons. Fix is done by adding a assess_threat() proc in simple_animal/drone that returns -10 (similar to silicons) 2014-10-17 18:04:33 +02:00
hornygranny 98d3ce08ed Merge pull request #5254 from paprka/underwearredux
Underwear updates
2014-10-17 07:55:34 -07:00
hornygranny 3224cdc151 Merge pull request #5182 from RemieRichards/XenoLeaping
Alien hunter leap ability
2014-10-17 07:36:57 -07:00
Jordie0608 76dddc56a0 Merge branch 'master' of https://github.com/tgstation/-tg-station into thesetypofixesdedicatedtoshakespeare
Conflicts:
	icons/obj/gun.dmi
2014-10-17 22:50:48 +11:00
paprka 8312c52286 Merge branch 'master' of https://github.com/tgstation/-tg-station into removegreyshirt
Conflicts:
	icons/mob/uniform.dmi
2014-10-16 21:29:10 -07:00
Remie Richards e124c29f8d Merge pull request #5201 from Cheridan/permits
Adds Construction Permits
2014-10-17 05:24:37 +01:00
Cheridan 1b8c69324f Merge pull request #5075 from Incoming5643/FuckIKEA
Carpet is now growable, whoa!
2014-10-16 23:00:07 -05:00
Cheridan 2ba66a3f3d Merge pull request #5259 from Aranclanos/SQL2logs
SDQL2 admin notice
2014-10-16 08:59:14 -05:00
Cheridan 13b59d2d0e Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD
Expands medipens & mining
2014-10-16 08:44:36 -05:00
Cheridan ccce2ee125 Merge pull request #5149 from RemieRichards/paprikaisbutthurt
Drones being picked up - Rebalance
2014-10-16 08:42:28 -05:00
Cheridan 368832093f Merge pull request #5185 from JJRcop/drone-tweaks
Drone Tweaks, Adjustments, Additions
2014-10-16 08:41:31 -05:00
Cheridan ec579469a7 Merge pull request #5269 from AnturK/fixuno
Fix for #5247
2014-10-16 08:36:12 -05:00
Cheridan 865391d6a1 Merge pull request #5233 from Jordie0608/stateoftheiconstates
[MAP] Fixes energy guns, coins, arrivals chairs and syndiebombs not having icons in map editor
2014-10-16 08:28:13 -05:00
Cheridan 17c9aaa6dd Merge pull request #5263 from Aranclanos/electropackrevamp
Electropack fixes
2014-10-16 08:08:57 -05:00
Incoming 31099161d9 Renames the proc 2014-10-15 16:38:41 -04:00
paprka c83592263b Revert removal of kinky underwears
w/e
2014-10-15 12:30:36 -07:00
Aranclanos 3e30a7fbab Nothing to see here, move along. 2014-10-15 11:40:12 -03:00
Remie Richards fae181be7c Narsie now has a spawn animation 2014-10-15 15:23:44 +01:00
Remie Richards 4256e2f264 Merge branch 'master' of https://github.com/tgstation/-tg-station into XenoLeaping
Conflicts:
	icons/mob/alien.dmi //Curse you WJ!
2014-10-15 15:08:12 +01:00
Aranclanos d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety
Adds click cooldown to clicking on mobs Fixes #4812 Take2
2014-10-15 11:03:02 -03:00
Aranclanos 722e0ef6e1 Merge pull request #5244 from Lo6a4evskiy/Pocket_runtime_fix
Fixed stripping items from pockets runtime
2014-10-15 10:52:09 -03:00
Aranclanos e6c533eb95 Merge pull request #5253 from phil235/SandstoneStackFix
You can no longer make stacks of grasstile/sandstone bigger than max amount
2014-10-15 10:46:58 -03:00
Aranclanos 0063e45ec1 Merge pull request #5236 from phil235/SignalerBugFix
Fixes some runtimes linked to signalers.
2014-10-15 10:44:51 -03:00