Commit Graph

13371 Commits

Author SHA1 Message Date
tkdrg
4e84fb2eef Changes a missed del() to qdel() 2015-01-04 16:22:27 -03: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
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
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
307b238e97 Merge pull request #6749 from Menshin/valve_he_icons_fix
Some atmos icons fixes
2015-01-03 19:38:52 -03:00
tkdrg
a411154581 Merge pull request #6755 from phil235/SpritesFixes
Three sprite related fixes
2015-01-03 19:20:00 -03:00
tkdrg
45ec9c4d88 Merge pull request #6754 from phil235/WeldingSoundAirlockFix
Fixing airlock welding sound.
2015-01-03 16:15:18 -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
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
tkdrg
bbe34b2a53 Merge pull request #6186 from Dorsisdwarf/Chemoverlaysreal
Chemdispenser Overlays [feature]
2015-01-03 02:26:10 -03: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
phil235
1153ef4700 Merge pull request #6651 from paprka/tablesandwindowsbaby
Fixes shuttle windows smoothing with normal windows
2015-01-03 00:22:29 +01:00
phil235
235f92623b Description now meantions all mutations that the vine has. 2015-01-03 00:15:06 +01:00
paprka
ad5872e84f fixes window junction update to use initial icon state 2015-01-02 15:14:36 -08: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
3aafd8ff26 Fixing airlock welding sound. 2015-01-02 19:18:06 +01: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
Menshin
910cfdaf6e * Fixed normalize_directions() for valves and simple pipes (fixes #6746)
* Added missing icons for hidden HE pipes and junctions (fixes #6636).
2015-01-02 10:35:12 +01:00
tkdrg
ac57c7007b Merge pull request #6723 from Boggart/airlockconstructionfix
Fixes being unable to build doors over firelocks, blast doors and shutters.
2015-01-02 04:16:17 -03:00
Boggart
0fd3f0d275 Improves fireaxe check for poddoors. 2015-01-01 23:15:01 -07: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
Boggart
0ceda7939c Adds the ability for admins to re-admin themselves once they de-admin. 2015-01-01 20:42:53 -07:00
tkdrg
8e8b761ae2 Merge pull request #6716 from psykzz/patch-2
Refactor Ears self healing
2015-01-01 17:18:08 -03:00
tkdrg
38acdca156 Merge pull request #6713 from phil235/DicerollRuntimeFix
Fixes runtime linked to diceroll proc
2015-01-01 16:58:39 -03:00
tkdrg
6a0f1be7cd Merge pull request #6584 from phil235/HoloSwordFix
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
2015-01-01 16:39:16 -03:00
tkdrg
be85bb6d17 Merge pull request #6707 from phil235/HostileAttackingTargetFix
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
2015-01-01 12:47:27 -03:00
Swag McYolosteinen
17c81726ce Merge pull request #6722 from tkdrg/holytitsmergethis
[HOLY TITS MERGE THIS] Fixes Hulk server crash bug and also a couple typos
2015-01-01 13:41:35 +01:00
MrStonedOne
2bb2469038 Fixes error with logging admin rank changes to the user's database record.
I forgot to add a field to the query in commit 138567b7cf when I modified it.
2014-12-31 23:19:43 -08:00
tkdrg
adc23dcd35 Merge pull request #6695 from Iamgoofball/raginmages
RAGIN' MAGES: Take 2: Working edition
2015-01-01 03:04:26 -03:00
Iamgoofball
56f2ec2721 >magin' 2014-12-31 21:58:21 -08:00
Iamgoofball
4b8bf0180e Update raginmages.dm 2014-12-31 21:55:38 -08:00
Iamgoofball
2c118837ad Update spellbook.dm 2014-12-31 21:30:27 -08:00
Remie Richards
215da4399a Merge pull request #6690 from Xhuis/hidden_book_in_bookcase
Allows you to put hollowed-out books in bookcases
2015-01-01 04:12:07 +00:00
Xhuis
88105318a6 Defines allowed books in main bookcase define 2014-12-31 23:08:23 -05:00
Boggart
ff17e083eb Fixes being unable to build doors over firelocks, blast doors and shutters.
As a result, any door with the sub_door variable set to 1 can have an airlock built over it.
Also fixes using a fireaxe to open unpowered poddoors and adds myself to the admins.txt.
2014-12-31 20:47:17 -07:00
tkdrg
371b66a334 Merge pull request #6678 from paprka/nitrile
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
Xhuis
c17e25aafa Polishes code with lists 2014-12-31 22:00:08 -05:00
tkdrg
908922f24c Fixes Hulk crash bug and typos 2014-12-31 23:28:14 -03:00
tkdrg
7e48be5be0 Merge pull request #6686 from paprka/lizstutterv2
Removes lizard stuttering
2014-12-31 23:22:38 -03:00
paprka
8661025135 Moves the typecast under the ischeck for space cleaner 2014-12-31 17:25:23 -08:00
paprka
9de9f4b3f8 istypes the space cleaner dirt clean 2014-12-31 17:21:36 -08:00
tkdrg
9a9f0bc058 Merge pull request #6691 from Menshin/clientless_peeking_runtime_fix
Fixes runtime with moving objects in/out of storage while clientless mobs peeking
2014-12-31 22:19:38 -03:00