tkdrg
652c8f5741
Merge pull request #6818 from Ergovisavi/more_pod_cloning
...
Some replica pod cloning fixes
2015-01-06 22:53:41 -03: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
tkdrg
67c9b5be21
Changes (Follow) to (F) in the ghost chat
2015-01-06 16:28:24 -03: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
f918815bea
Merge pull request #6741 from tkdrg/atmoslog
...
Adds atmos investigate_log
2015-01-06 07:56:17 +00: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
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
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
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
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
Ergovisavi
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
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
Remie Richards
ed1375d454
Fixes Humanize and Monkeyize producing invisible changelings and never deleting their Animation overlay.
2015-01-04 11:03:10 +00: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
tkdrg
b94fcf06b3
Merge pull request #6756 from phil235/VinesDescFix
...
Makes mutated vines description more explicit about the mutation type
2015-01-03 20:04:43 -03:00
tkdrg
a411154581
Merge pull request #6755 from phil235/SpritesFixes
...
Three sprite related fixes
2015-01-03 19:20:00 -03:00
tkdrg
420ac3939a
Adds a (follow) link to ghost messages
...
Clicking on said link is the same as using the "Follow" verb and
selecting the sender's name. Inspired by the feature on baycode.
2015-01-03 16:56:10 -03:00
Ergovisavi
d26c47d33c
Merge pull request #6752 from phil235/PotatoParmigianaFixes
...
Fixes potato cell construction and eggplant parmigiana recipe
2015-01-03 09:58:38 -08:00
tkdrg
8180da65fa
Merge pull request #6528 from TZK13/Socks
...
Adds socks as an underwear option and adds a few new undershirts
2015-01-03 14:17:17 -03:00
tkdrg
732dff0796
Merge pull request #6751 from Menshin/gun_message_fix
...
Fixed a typo that could prevent gun firing message from appearing.
2015-01-03 13:44:30 -03:00
TZK13
c0b4ea1092
Reverted removal of jerseys.
2015-01-03 10:33:45 -06:00
phil235
6d6547467a
Fixes simple animals not being able to unbuckle themselves.
...
Fixes pet slime. There's no longer two types of adult pet slimes, simplifying adult pet slime's Die() proc.
Fixing some absolute path in slime/slime.dm
2015-01-03 14:35:14 +01:00
TZK13
bf5bddf0c7
Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks
...
Conflicts:
config/admins.txt
2015-01-03 07:07:03 -06:00
Menshin
2c28b745ab
Fixes cryptobiolin quantity never diminishing in a mob ( #6769 ).
2015-01-03 11:18:13 +01:00
tkdrg
bbe34b2a53
Merge pull request #6186 from Dorsisdwarf/Chemoverlaysreal
...
Chemdispenser Overlays [feature]
2015-01-03 02:26:10 -03:00
Sawu
ce20829485
Changes to speech, comments
...
*Added a couple of extra comments
*Added a bunch of extra words to the NPC's vocab, along with a suggestion.
2015-01-03 15:54:57 +11:00
Sawu
6d3d638379
Change/fix to door checks.
...
*Uses density now instead of layer.
2015-01-03 15:26:32 +11:00
Sawu
91d1d0582c
Quickfixes for SNPCs
...
*Adds a variable for the chattyness of NPCs
*Removes unneeded variable
*Fixes NPCs using weapons/items after dropped
*Fixes some combat problems, makes them more robust in general
2015-01-03 15:21:27 +11:00
tkdrg
1a4c360640
Merge pull request #6743 from Boggart/readmin
...
Adds the ability for admins to re-admin themselves once they de-admin.
2015-01-03 00:36:02 -03:00
Sawu
ba45b07db5
Adds updated, fixed versions of the Sawustation SNPCs, they mostly function but have a few minor problems, but are otherwise working.
2015-01-03 13:50:09 +11:00
phil235
235f92623b
Description now meantions all mutations that the vine has.
2015-01-03 00:15:06 +01:00
phil235
840d2e87bd
Makes mutated vines description be explicit about the type and special function of the vines. "These are oxygen consuming vines."
2015-01-02 23:35:25 +01:00
phil235
eacdc7e920
Fixes emt cap sprite disappearing.
...
Fixes bloodyhand overlay appearing in front of shield.
Fixes white pixels on some disposal pipe junctions sprites.
2015-01-02 22:36:07 +01:00
Boggart
bb6125a5f1
Fixes feedback on failure due to null rank or disconnected DB. Sanitizes ckey in DB query.
2015-01-02 13:24:49 -07:00
phil235
cf48bb8364
Fixes potato cell construction being broken
...
Fixes eggplant parmigiana recipe (it was inheriting reagent requirements from spaghetti). I changed recipes so that they never inherit items or reagents requirements from a parent recipe to make adding new recipes in each categories less prone to mistakes.
2015-01-02 18:18:26 +01:00
Menshin
ea6d74992f
Fixed a typo that can prevent gun firing message from appearing.
2015-01-02 17:51:34 +01:00
Boggart
aed9d6b0e2
Fixes some tabs being spaces.
2015-01-01 23:05:32 -07:00
Boggart
2b0932047a
Improves feedback to the user of the re-admin verb.
2015-01-01 23:02:18 -07:00
tkdrg
84e3eaaf16
Merge pull request #6676 from Jordie0608/beeverycarefulwiththese
...
Adds bee and butterfly disease to virus pack
2015-01-02 02:33:23 -03:00