56c853f9d6
Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/mouse.dm
2014-10-21 15:58:39 +02:00
c4668885ec
Merge branch 'master' of https://github.com/tgstation/-tg-station into cooljackets
...
Conflicts:
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
2014-10-20 21:38:39 -07:00
74dfbeb92c
adds bomber and leather jackets
2014-10-20 21:36:40 -07:00
1c9c6d5950
Merge pull request #5249 from phil235/DisplacedGirderFix
...
Fix for #4602
2014-10-20 20:18:06 -07:00
455b526cc1
Merge pull request #5318 from phil235/MsgFix2
...
More messages fixed
2014-10-19 21:39:06 -05:00
2a8e772131
Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
...
Conflicts:
code/modules/projectiles/ammunition/magazines.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/mob/back.dmi
icons/obj/gun.dmi
2014-10-19 17:30:47 -07:00
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
d9dafa9649
Fix cyborg flashes being useable in flashers and cyborg heads.
2014-10-19 04:35:10 +01:00
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
fdde99e3ca
Merge pull request #5239 from tkdrg/sanictoobs
...
Makes transit tubes a lot faster
2014-10-18 09:54:48 +02:00
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
e124c29f8d
Merge pull request #5201 from Cheridan/permits
...
Adds Construction Permits
2014-10-17 05:24:37 +01:00
c29cc89864
Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
...
Conflicts:
icons/obj/gun.dmi
2014-10-16 09:26:26 -07:00
17c9aaa6dd
Merge pull request #5263 from Aranclanos/electropackrevamp
...
Electropack fixes
2014-10-16 08:08:57 -05:00
d244fd6bbd
initial commit
2014-10-15 13:29:19 -07:00
45cfe07f98
Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix
...
Conflicts:
code/modules/recycling/disposal.dm
2014-10-15 18:23:40 +02:00
dbea503e88
Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.
...
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
2014-10-15 18:03:06 +02:00
1ed1c6f40b
Changed breakout times to use the new constants
2014-10-15 11:40:25 -03:00
e9f418d568
Merge branch 'master' into sanictoobs
2014-10-15 11:39:27 -03:00
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
26f70fd9aa
* Completed the _strip_html_properly_ proc to also limit the length of the text
...
* Removed uses of _strip_html_simple_
* Replaced input or redondant trimming/text_copying with the new unified _stripped_input_
2014-10-15 16:00:22 +02:00
7bb012127c
Merge pull request #5235 from phil235/CollapsibleRollerBed
...
Collapsible Rollerbed
2014-10-15 11:54:48 +01:00
a1d49cfeb4
Changes the path of electropacks from objitemdeviceradioelectropack to objitemdeviceelectropack.
...
Fixes some runtimes related to electropacks.
Securing electropacks will no longer be required to use a helmet on it, same with dissembling the shockkit with a wrench or placing it in a chair.
Removes the atom var 'moved_recently' that was only used by electropacks (really). Now the electropack will have an inner cooldown instead.
The cooldown of the shock will be 10 seconds, giving the shocked person some small time to move in-between shocks (the shock gives you 5 of weakened).
2014-10-14 21:44:56 -03:00
c6ba2b5c22
Shortens stopped tube time and cleans up a bit
2014-10-14 14:14:58 -03:00
f4f716c3a7
Adding a CanPass() proc to girders. Projectiles can now sometimes pass through them, with varying percentage chance depending on girder subtypes.
...
Fixing reinforced and disloged girders being called "reinforced" or "disloged" upon examination instead of "disloged girder" and "reinforced girder".
Adding passtable and passgrille to mice for consistency, because chicks already have those flags.
2014-10-14 17:56:48 +02:00
c6d5a44269
Makes transit tubes a lot faster
2014-10-13 19:55:30 -03:00
20d6524945
cleaned up code and added orange jumpsuits
2014-10-13 15:36:50 -07:00
cd78c2b067
Adding puppies and kittens to the small mob category.
...
Increasing mob_storage_capacity for closet and bodybag to 4 and 6 respectively.
2014-10-13 19:03:56 +02:00
cf40b75313
fixing typo
2014-10-13 18:52:13 +02:00
619a38ad89
Adds the ability to collapse rollerbed (from baystation). Fixes being able to pick up pill bottles and fold bodybags through windows via click drag.
2014-10-13 17:17:53 +02:00
07b621421c
Merge pull request #5196 from phil235/grammarFix1
...
Small grammar fix.
2014-10-13 11:41:45 +01:00
399977d882
Merge pull request #5095 from MrPerson/table_module
...
Move table crafting into the modules folder plus improvements
2014-10-13 10:42:16 +01:00
20c6f4cbac
Merge pull request #5173 from paprka/knocky
...
Unique sound for knocking on glass with bare hand/TK
2014-10-12 20:50:57 +01:00
36cbf06ed9
closets and its children can no longer contain a near infinite amount of mobs.
...
Adding a mob_size var to mob/living . All closets can still contain the same amount of small sized mobs as before(mouse, parrot,pAI, viscerator, lizard, chick), but they can no longer contain large mobs (alien emperess, blobbernaut, juggernaut, hostile tree, goliath), and they can contain a few human sized mobs (three for bodybags, two for closets and other children).
2014-10-12 18:46:56 +02:00
816cc598ce
Merge pull request #5155 from tkdrg/tubemagic
...
Transit tube construction bugfix
2014-10-12 10:09:03 +02:00
5eb6a82970
Merge branch 'master' of https://github.com/tgstation/-tg-station into permits
...
Conflicts:
icons/obj/items.dmi
2014-10-11 17:48:46 -05:00
84e7121903
Adds construction permits
2014-10-11 17:39:27 -05:00
f673093ee5
Merge pull request #5135 from paprka/undershirtstake2
...
Undershirts and jumpsuit overhaul
2014-10-11 20:02:55 +01:00
3d0778e873
Small grammar fix.
2014-10-11 17:44:54 +02:00
cd78d2eb37
Merge pull request #4863 from Menshin/girders_building_consistency
...
Consistency fix for disloged girders securing and building on
2014-10-11 13:41:18 +02:00
863f28f295
On second thought, leave the result as just a path
...
Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.
Merge branch 'master' of https://github.com/tgstation/-tg-station into table_module
Conflicts:
code/game/objects/structures/tables_racks.dm
2014-10-10 14:30:41 -07:00
b54ed5b4e5
Merge pull request #5137 from paprka/holosignoff
...
Adds holographic janitor signs
2014-10-10 17:41:41 +01:00
afb0808748
Merge pull request #5133 from paprka/glovestation
...
Changes robotics gloves to fingerless gloves
2014-10-10 17:26:40 +01:00
bfa448864b
Added unique sound for knocking on glass
2014-10-10 09:07:23 -07:00
cc5a29b9fb
Fixes tube pod decon & gives tubes two spin dirs
2014-10-09 19:18:35 -03:00
30b3294adc
Merge pull request #5123 from paprka/zippycuffs
...
Adds zipties
2014-10-08 21:12:05 -07:00
981df33b57
Merge pull request #5129 from paprka/hospatch
...
Eyepatch HUD for HoS
2014-10-08 19:50:53 -07:00
5595d57f57
Add the click cooldown define to the last special defines
...
This will stop these getting out of sync and let you change
all times with a single define
2014-10-09 14:52:47 +13:00
f737f7889c
Defines for the define god
2014-10-09 14:49:28 +13:00
23651b54f0
Merge pull request #5093 from paprka/medipens
...
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
phil235
paprka
hornygranny
Cheridan
xxalpha
Swag McYolosteinen
Remie Richards
tkdrg
Aranclanos
Menshin
MrPerson
Francis Devine