Commit Graph

13447 Commits

Author SHA1 Message Date
tkdrg bf6b60c7ce Merge pull request #6758 from Menshin/crowbar_prying
Some machinery tweaking + crowbar prying added
2015-01-06 21:25:17 -03:00
Menshin e57ed1f683 Fixed people being able to walk out of locked DNA scanner. 2015-01-07 00:09:38 +01:00
Menshin 9e235dd67a * Added a default proc for prying open unpowered/broken machines using a crowbar
* Added an option to not set the machine when checking for attackhand() in machine class (prevent infitine loops if a machine doesn't have a dialog and called ..())
* Sleepers, cryo cells and DNA scanners can now be pried open when non-fonctional
* Cleaned and standardized DNA scanners code by using the general machine class
* Made sure destroyed machines drop their contents

* Added icon updating for mech bay power console and mecha control console (operational, powerless and broken states)
* Cleaned up and aligned the borg recharger station code with its parent code
* Added powerless codersprites for the borg recharger station
* Non operational borg recharger station can now be pried open from the outside.
2015-01-06 23:57:19 +01:00
hornygranny 2f54c914cd Merge pull request #6854 from Carn/shuttle_fix
Fixes a number of urgent mapping errors with recent shuttle overhaul
2015-01-06 14:21:21 -08:00
carnie e693ed3e9f Fixes a number of urgent mapping errors with recent shuttle overhaul (on both generic and tg zlevel)
Improves clean_map.bat - will now prompt you for a path relative to the map_files directory, making it easier to use with the new split-zlevel maps
Improves prepare_map.bat - will now automatically backup ALL .dmm files in map_files and subdirectories.
2015-01-06 21:58:05 +00:00
Swag McYolosteinen 714cc8c59e Merge pull request #6780 from tkdrg/wooh
Adds a (follow) link to ghost messages
2015-01-06 20:58:56 +01:00
Remie Richards 186ee1a5d6 Merge pull request #6778 from tkdrg/fuk-u
Fixes crash bug in the byond beta
2015-01-06 19:32:51 +00:00
tkdrg 67c9b5be21 Changes (Follow) to (F) in the ghost chat 2015-01-06 16:28:24 -03:00
Razharas 92cbbb849d Merge pull request #6833 from tgstation/revert-6733-asteroidareas
Revert "Moves all the custom AsteroidStation areas"
2015-01-06 22:11:49 +03:00
carnie 380e176adc Resolves #6832
Resolves #6838
Sorry, this was a really big dumb on my part. Accidentally changed an 'in world' to 'in machines'
2015-01-06 17:30:48 +00:00
Sawu 906ab53921 Quickfix to conform with the rewrite. 2015-01-07 01:51:39 +11:00
Sawu 8fcd55bd4d Merge branch 'master' of https://github.com/tgstation/-tg-station into interactive 2015-01-07 01:43:44 +11:00
Remie Richards badbec05c5 Merge pull request #6596 from tkdrg/IllustriousImpeccableArcticwolf
Adds a "tip of the round" system
2015-01-06 07:56:29 +00:00
Remie Richards f918815bea Merge pull request #6741 from tkdrg/atmoslog
Adds atmos investigate_log
2015-01-06 07:56:17 +00:00
tkdrg 48f3560a11 Adds a N2O canister message_admins 2015-01-06 04:51:52 -03:00
tkdrg 234e5bd64c Merge pull request #6811 from paprka/spessbuckle
Fixes chair/bed buckle message
2015-01-06 04:38:48 -03:00
tkdrg 09c91e8f1e Merge remote-tracking branch 'upstream/master' into IllustriousImpeccableArcticwolf
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-01-06 04:35:46 -03:00
Remie Richards 76897893bd Merge pull request #6642 from tkdrg/toupper
Improves Permission Panel security, take 2
2015-01-06 07:24:03 +00:00
Remie Richards 005d79073a Merge pull request #6731 from tkdrg/ntrc_strikes_back
Adds an "unread message count" to the NTRC link
2015-01-06 07:22:45 +00:00
Remie Richards b798df68ab Merge pull request #6790 from tkdrg/ExhaustedPlumpCamel
Fixes a few RPD painting bugs
2015-01-06 07:20:28 +00:00
tkdrg 931f75b7e8 Merge pull request #6779 from TZK13/Crayon-Body-Outlines
Adds a new body outline graffiti for crayons and gives the detective a white crayon
2015-01-06 04:18:21 -03:00
tkdrg 890c6f8ebe Merge pull request #6799 from Xhuis/knife_fix
Makes the butcher cleaver a normal-sized item
2015-01-06 03:26:30 -03:00
tkdrg c551bbf213 Merge pull request #6626 from psykzz/patch-1
File restructure
2015-01-06 01:54:47 -03:00
tkdrg d7a4da89ca Merge pull request #6786 from TedStudley/ntsl-update
Updates/fixes to NTSL
2015-01-06 01:43:01 -03:00
tkdrg 1716a82400 Merge pull request #6794 from psykzz/patch-4
Cell() Update
2015-01-06 01:22:30 -03:00
tkdrg 7394d3c0e6 Merge pull request #6806 from paprka/endroundshuttle
Adds a new endround sound
2015-01-06 01:19:24 -03:00
Xhuis 8f42d43b04 Merge remote-tracking branch 'remotes/upstream/master' into knife_fix 2015-01-05 21:35:05 -05:00
Sawu d091119545 Ergo's Changes
*Examine shows NPCs a unique message
*NPCs should no longer stand and stare at people in combat.
*Toned down the amount of rudeness in their speech.
2015-01-06 13:23:58 +11:00
tkdrg e226e0e1aa Revert "Moves all the custom AsteroidStation areas" 2015-01-05 21:51:07 -03:00
CorruptComputer 0efd9f46f8 Merge pull request #6733 from CorruptComputer/asteroidareas
Moves all the custom AsteroidStation areas
2015-01-05 18:42:28 -06:00
CorruptComputer 42a899969a removed /improper 2015-01-05 17:10:50 -06:00
Xhuis a5c9a7292f Makes butcher's cleaver a child of kitchen knife 2015-01-05 17:23:03 -05:00
carnie 281df385a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2015-01-05 19:52:03 +00:00
carnie a730649167 Fixes breathing (indentation error)
Fixes atmos machinery (old global list snuck back into code)
2015-01-05 19:44:17 +00:00
Ergovisavi 7a83165f2b Merge pull request #6773 from phil235/ShadeBuckleFix
Fixes simple animals not being able to unbuckle themselves.
2015-01-05 10:45:13 -08:00
paprka 39f27a07e2 fixes buckle message 2015-01-04 21:56:50 -08:00
paprka 2d1cdf7d10 Adds a new endround sound 2015-01-04 16:26:44 -08:00
tkdrg 4e84fb2eef Changes a missed del() to qdel() 2015-01-04 16:22:27 -03:00
Xhuis e7a9a0bdfc Makes the butcher cleaver a normal-sized item 2015-01-04 14:21:27 -05:00
Matt Smith 249e19b935 Cell() Update
Was being output straight to the user, it looked like that might cause the order to be wrong.
Doing this because it looks like the intended results.
2015-01-04 15:11:52 +00:00
phil235 8f53dcbfb0 Merge pull request #6770 from Menshin/cryptobiolin_process_fix
Fixes cryptobiolin quantity never diminishing in a mob
2015-01-04 15:10:58 +01:00
phil235 6c156f5218 Merge pull request #6774 from psykzz/patch-2
Fixing desc to show max cap of the RCD
2015-01-04 15:04:45 +01:00
phil235 d79c6fe929 Merge pull request #6617 from Firecage/Statue_Fixes
Statue fixes
2015-01-04 13:53:45 +01:00
Remie Richards ed1375d454 Fixes Humanize and Monkeyize producing invisible changelings and never deleting their Animation overlay. 2015-01-04 11:03:10 +00:00
tkdrg 2eb366de89 Fixes a few RPD painting bugs
Changes RPD colors to be consistent with pipe painter & default pipes.
Makes the RPD properly update its neighbors on painting.
Offloads the neighbor updating logic from pipe_painter to a pipe proc.
Fixes #6783
2015-01-04 04:35:36 -03:00
Sawu 47dd60e7bf Changes to the Chatter module.
*NPCs now use pick_list to draw their speech from strings/npc_chatter.txt
2015-01-04 16:37:59 +11:00
Remie Richards 3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf
Adds dirt overlays for walking on simulated turfs
2015-01-04 02:22:50 +00:00
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
carnie e285bd0b3c Map Update 2015-01-04 01:45:02 +00:00
TedStudley 777a2800a3 Updates/fixes to NTSL
- Fixed NTSL division
  - Added new NTSL math functions
  - Added changelog information
2015-01-03 17:43:43 -08:00