Aranclanos
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
Remie Richards
7bb012127c
Merge pull request #5235 from phil235/CollapsibleRollerBed
...
Collapsible Rollerbed
2014-10-15 11:54:48 +01:00
phil235
cf40b75313
fixing typo
2014-10-13 18:52:13 +02:00
phil235
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
Remie Richards
07b621421c
Merge pull request #5196 from phil235/grammarFix1
...
Small grammar fix.
2014-10-13 11:41:45 +01:00
Remie Richards
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
Remie Richards
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
Swag McYolosteinen
816cc598ce
Merge pull request #5155 from tkdrg/tubemagic
...
Transit tube construction bugfix
2014-10-12 10:09:03 +02:00
Remie Richards
f673093ee5
Merge pull request #5135 from paprka/undershirtstake2
...
Undershirts and jumpsuit overhaul
2014-10-11 20:02:55 +01:00
phil235
3d0778e873
Small grammar fix.
2014-10-11 17:44:54 +02:00
Swag McYolosteinen
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
MrPerson
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
Remie Richards
b54ed5b4e5
Merge pull request #5137 from paprka/holosignoff
...
Adds holographic janitor signs
2014-10-10 17:41:41 +01:00
Remie Richards
afb0808748
Merge pull request #5133 from paprka/glovestation
...
Changes robotics gloves to fingerless gloves
2014-10-10 17:26:40 +01:00
paprka
bfa448864b
Added unique sound for knocking on glass
2014-10-10 09:07:23 -07:00
tkdrg
cc5a29b9fb
Fixes tube pod decon & gives tubes two spin dirs
2014-10-09 19:18:35 -03:00
hornygranny
30b3294adc
Merge pull request #5123 from paprka/zippycuffs
...
Adds zipties
2014-10-08 21:12:05 -07:00
hornygranny
981df33b57
Merge pull request #5129 from paprka/hospatch
...
Eyepatch HUD for HoS
2014-10-08 19:50:53 -07:00
Francis Devine
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
Francis Devine
f737f7889c
Defines for the define god
2014-10-09 14:49:28 +13:00
Remie Richards
23651b54f0
Merge pull request #5093 from paprka/medipens
...
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
paprka
5457503c67
adds holographic janitor signs
2014-10-08 13:48:44 -07:00
paprka
d61e4ac943
big commit, handcuff overhaul
2014-10-08 13:19:54 -07:00
paprka
4c78323aa0
conflict resolution
2014-10-08 11:38:03 -07:00
paprka
b8eb9e3587
general code optimizations
2014-10-08 10:10:03 -07:00
paprka
18108257ae
Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2
...
Conflicts:
code/__HELPERS/mobs.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/sprite_accessories.dm
2014-10-08 09:48:49 -07:00
paprka
668bb52a1e
Merge branch 'master' of https://github.com/tgstation/-tg-station into zippycuffs
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-10-08 07:17:42 -07:00
paprka
d80be7f689
changes robotics gloves to fingerless gloves
2014-10-08 05:11:30 -07:00
Remie Richards
f5e54f1fa8
Merge pull request #5069 from phil235/WindoorDeconstruction
...
Adds windoor deconstruction & bug fixes
2014-10-08 10:27:45 +01:00
hornygranny
c28dd40190
Merge pull request #5085 from paprka/WYATTSHIELDS
...
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
paprka
216682bccf
eyepatch HUD
2014-10-07 19:18:18 -07:00
Cheridan
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
paprka
0e1083fc39
adds zipcuffs
2014-10-06 20:35:10 -07:00
Cheridan
66304667cf
Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
code/datums/uplink_item.dm
2014-10-06 19:27:14 -05:00
Remie Richards
ea4e6f823c
Merge pull request #5051 from paprka/rollingjsuit
...
Ports and improves jumpsuit rolling (casual adjusting) and noir detective set
2014-10-06 20:45:28 +01:00
Remie Richards
175d42061c
Merge pull request #5088 from paprka/syndiesheet
...
Syndicate mother base/ship changes
2014-10-06 20:44:02 +01:00
Remie Richards
304a865ff7
Merge pull request #5089 from tkdrg/tubesarecool
...
Constructable transit tubes!
2014-10-06 14:22:22 +01:00
MrPerson
694f9fda91
Tablecrafting improvements:
...
Allow more than one result. All components will be placed inside the first result in the list.
Completion of crafting will now reset the interface, if possible.
Opening the interface now causes you to face the table.
2014-10-06 01:24:26 -07:00
Cheridan
f5b5ead3ef
Merge pull request #4516 from MrPerson/examinate_the_doctor
...
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
tkdrg
4ef2e494a1
Changes flip/rotation, better diagonal handling
2014-10-05 14:09:10 -03:00
phil235
dd7a3b7fbc
Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-10-05 13:48:11 +02:00
tkdrg
0c9c9c8b0a
Reduces decon time to 35 and adds a missed init_dirs
2014-10-05 08:46:34 -03:00
phil235
e1c0351e16
Merge branch 'master' of https://github.com/tgstation/-tg-station into plasmadoorfix
...
Conflicts:
code/game/machinery/doors/airlock.dm
2014-10-05 13:24:14 +02:00
MrPerson
b04f547cd1
Move table crafting into the modules folder
2014-10-04 23:43:03 -07:00
paprka
1bb6603ff4
replaces a lot of inaprov syringes with medipens
2014-10-04 22:03:09 -07:00
Cheridan
fb7aff426d
Merge pull request #5039 from paprka/hatstation13
...
Some job-specific hat rebalancing
2014-10-04 20:51:08 -05:00
tkdrg
d7937fcd1a
This comment was supposed to be deleted
2014-10-04 21:58:12 -03:00
paprka
2257c8f985
new syndicate map changes
2014-10-04 17:40:28 -07:00
Cheridan
08be1b34eb
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
tkdrg
d0ce2a848d
First iteration of constructable transit tubes
2014-10-04 21:18:41 -03:00
