feb141ca15
Merge branch 'master' of https://github.com/tgstation/-tg-station into freshfood
...
Conflicts:
code/modules/research/designs/machine_designs.dm
2015-01-08 03:58:31 +11:00
a4fa7027bc
Merge pull request #6830 from Menshin/atmos_null_parent_fix
...
Fixes atmos machinery sometimes getting null pipenet.
2015-01-07 00:20:36 -03:00
652c8f5741
Merge pull request #6818 from Ergovisavi/more_pod_cloning
...
Some replica pod cloning fixes
2015-01-06 22:53:41 -03:00
e545f26d9c
Merge pull request #6823 from Firecage/Plasma_floor_fix
...
Fixes plasma floors not being deleted.
2015-01-06 21:53:10 -03:00
bf6b60c7ce
Merge pull request #6758 from Menshin/crowbar_prying
...
Some machinery tweaking + crowbar prying added
2015-01-06 21:25:17 -03:00
e57ed1f683
Fixed people being able to walk out of locked DNA scanner.
2015-01-07 00:09:38 +01:00
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
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
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
714cc8c59e
Merge pull request #6780 from tkdrg/wooh
...
Adds a (follow) link to ghost messages
2015-01-06 20:58:56 +01:00
186ee1a5d6
Merge pull request #6778 from tkdrg/fuk-u
...
Fixes crash bug in the byond beta
2015-01-06 19:32:51 +00:00
67c9b5be21
Changes (Follow) to (F) in the ghost chat
2015-01-06 16:28:24 -03:00
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
01dedd5ea2
Merge branch 'freshfood' of https://github.com/sawu-tg/-tg-station into freshfood
2015-01-07 04:39:30 +11:00
fba1ccd697
Quickfixes
...
*Fixes missing recipe for experimentor
*Fixes the experimentor having the wrong board inside it.
2015-01-07 04:38:49 +11:00
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
ada8b7f23f
Fixes a rogue :
...
Makes him . instead.
2015-01-07 04:25:16 +11:00
ad4204e43f
Fixed Grammar error
...
sawu-tg has fixed the error!.
2015-01-07 04:04:59 +11:00
ccce11fa6e
Nerfed the Gas reaction majorly.
...
*Now uses beepskysmash instead of pacid.
2015-01-07 03:30:54 +11:00
906ab53921
Quickfix to conform with the rewrite.
2015-01-07 01:51:39 +11:00
8fcd55bd4d
Merge branch 'master' of https://github.com/tgstation/-tg-station into interactive
2015-01-07 01:43:44 +11:00
badbec05c5
Merge pull request #6596 from tkdrg/IllustriousImpeccableArcticwolf
...
Adds a "tip of the round" system
2015-01-06 07:56:29 +00:00
f918815bea
Merge pull request #6741 from tkdrg/atmoslog
...
Adds atmos investigate_log
2015-01-06 07:56:17 +00:00
48f3560a11
Adds a N2O canister message_admins
2015-01-06 04:51:52 -03:00
234e5bd64c
Merge pull request #6811 from paprka/spessbuckle
...
Fixes chair/bed buckle message
2015-01-06 04:38:48 -03:00
09c91e8f1e
Merge remote-tracking branch 'upstream/master' into IllustriousImpeccableArcticwolf
...
Conflicts:
code/controllers/subsystem/ticker.dm
2015-01-06 04:35:46 -03:00
76897893bd
Merge pull request #6642 from tkdrg/toupper
...
Improves Permission Panel security, take 2
2015-01-06 07:24:03 +00:00
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
b798df68ab
Merge pull request #6790 from tkdrg/ExhaustedPlumpCamel
...
Fixes a few RPD painting bugs
2015-01-06 07:20:28 +00:00
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
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
c551bbf213
Merge pull request #6626 from psykzz/patch-1
...
File restructure
2015-01-06 01:54:47 -03:00
d7a4da89ca
Merge pull request #6786 from TedStudley/ntsl-update
...
Updates/fixes to NTSL
2015-01-06 01:43:01 -03:00
1716a82400
Merge pull request #6794 from psykzz/patch-4
...
Cell() Update
2015-01-06 01:22:30 -03:00
7394d3c0e6
Merge pull request #6806 from paprka/endroundshuttle
...
Adds a new endround sound
2015-01-06 01:19:24 -03:00
8f42d43b04
Merge remote-tracking branch 'remotes/upstream/master' into knife_fix
2015-01-05 21:35:05 -05:00
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
e226e0e1aa
Revert "Moves all the custom AsteroidStation areas"
2015-01-05 21:51:07 -03:00
0efd9f46f8
Merge pull request #6733 from CorruptComputer/asteroidareas
...
Moves all the custom AsteroidStation areas
2015-01-05 18:42:28 -06:00
c63af563bc
Fixed binaries and terniary spawning with the same pipenet for all parents when constructed without connecting pipes ( fixes #6632 )
2015-01-06 00:43:59 +01:00
42a899969a
removed /improper
2015-01-05 17:10:50 -06:00
a5c9a7292f
Makes butcher's cleaver a child of kitchen knife
2015-01-05 17:23:03 -05:00
0cbf1355f9
Fixes plasma floors not being fixed.
2015-01-05 22:37:30 +02:00
281df385a2
Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
2015-01-05 19:52:03 +00:00
a730649167
Fixes breathing (indentation error)
...
Fixes atmos machinery (old global list snuck back into code)
2015-01-05 19:44:17 +00:00
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
1cd8dd90b7
Fixing an issue that would prevent pod cloning from working if the mob leaves its body before blood is drawn
2015-01-05 06:25:48 -08:00
39f27a07e2
fixes buckle message
2015-01-04 21:56:50 -08:00
2d1cdf7d10
Adds a new endround sound
2015-01-04 16:26:44 -08:00
4e84fb2eef
Changes a missed del() to qdel()
2015-01-04 16:22:27 -03:00
Sawu
tkdrg
Menshin
Menshin
hornygranny
carnie
Swag McYolosteinen
Remie Richards
Razharas
Xhuis
CorruptComputer
Firecage
Ergovisavi
paprka