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
175d42061c
Merge pull request #5088 from paprka/syndiesheet
...
Syndicate mother base/ship changes
2014-10-06 20:44:02 +01:00
304a865ff7
Merge pull request #5089 from tkdrg/tubesarecool
...
Constructable transit tubes!
2014-10-06 14:22:22 +01:00
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
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
4ef2e494a1
Changes flip/rotation, better diagonal handling
2014-10-05 14:09:10 -03:00
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
0c9c9c8b0a
Reduces decon time to 35 and adds a missed init_dirs
2014-10-05 08:46:34 -03:00
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
b04f547cd1
Move table crafting into the modules folder
2014-10-04 23:43:03 -07:00
1bb6603ff4
replaces a lot of inaprov syringes with medipens
2014-10-04 22:03:09 -07:00
fb7aff426d
Merge pull request #5039 from paprka/hatstation13
...
Some job-specific hat rebalancing
2014-10-04 20:51:08 -05:00
d7937fcd1a
This comment was supposed to be deleted
2014-10-04 21:58:12 -03:00
2257c8f985
new syndicate map changes
2014-10-04 17:40:28 -07:00
08be1b34eb
Revert "Changes a few green crosses to blue on sprites that I missed last time"
2014-10-04 19:22:10 -05:00
d0ce2a848d
First iteration of constructable transit tubes
2014-10-04 21:18:41 -03:00
537280b4b9
Removing many instances of the no longer used second argument of message_admins() proc.
...
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
6d4fb1483a
adds telescopic riot shields
2014-10-04 15:58:27 -07:00
3b150a0249
Merge pull request #5012 from phil235/APCFix
...
APC/airlocks/alarms fixes
2014-10-04 11:42:45 -05:00
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
a1475c7bf1
Correcting a naming problem.
2014-10-03 17:35:21 +02:00
0b605e7bdf
more NT ports
2014-10-01 18:36:57 -07:00
822613d698
remove helmet pathing
2014-10-01 15:01:36 -07:00
47521d5081
More windoor bug fixes. You can no longer build two windoors on top of each other. You can make a windoor_assembly w/ rglass on the same tile as another one as long as they have different directions.
2014-09-30 23:05:18 +02:00
6db18cff96
initial commit
2014-09-30 13:41:02 -07:00
a499710081
hat rebalancing
2014-09-30 13:08:13 -07:00
b53c96d08f
windoor deconstruction plus many fixes. See description.
2014-09-30 21:17:07 +02:00
c6c2074899
many fixes. see description.
2014-09-28 19:46:52 +02:00
d9ee81bb96
Merge pull request #4815 from phil235/AudibleMsgFix
...
Simplifying audible messages
2014-09-27 15:01:56 +02:00
1840d72ae4
reverting to show_message proc in three places.
2014-09-25 19:14:51 +02:00
3248e23887
Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
...
Conflicts:
code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
7afbd3345b
Replacing some hearers(...) with get_hearers_in_view(...).
...
Renaming Make Sound to Object Say.
Switching deaf_message in audible_message proc to last argument.
Replacing some "for(mob in hearers)+show_message" with audible_message()
2014-09-25 18:22:27 +02:00
796e540dfc
Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-09-25 09:37:54 -06:00
02d3cdc199
Merge pull request #4938 from hornygranny/tableclimbing
...
table bugfixes
2014-09-24 19:09:26 -05:00
24edf9f6d4
Fixes #4933 by refactoring climbing (ty MrPerson)
2014-09-24 12:31:24 -07:00
f9e17faca3
Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
...
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
8aa5fd2ff6
ishuman changed to istype for previously defined scope
2014-09-23 10:43:26 -07:00
4176e6d106
only humans can climb
2014-09-21 21:58:30 -07:00
c4efa0f773
Downgraded ammunition locker to a regular closet
...
The armory doesn't need two secure lockers, and certainly not one just to hold beanbag shells.
2014-09-21 22:02:35 -06:00
4616ca7c63
Merge pull request #4764 from hornygranny/tableclimbing
...
humans can climb onto tables
2014-09-20 16:58:20 -05:00
7f059a82fa
changed stun to Stun() :^)
2014-09-19 22:31:54 -07:00
762ee20a08
Fixes wrong ignite adminlog message when clicking plasma airlock with hand.
...
Fixes checks during welding of closets, walls, mineral walls, airlocks.
2014-09-19 22:42:53 +02:00
1b9eddc2e4
climbing a table stuns you
2014-09-19 13:32:44 -07:00
6dde12b8ed
Merge pull request #4838 from Jordie0608/breakingrillesisagreatwaytoruinabarbeque
...
Updates grille damages Fixes #796
2014-09-19 18:46:14 +01:00
9458d30d3a
Merge pull request #4718 from Perakp/wetShower
...
Showers wet the floor
2014-09-19 16:28:04 +01:00
40e0a52283
Repaths clown ore to bananium
2014-09-19 21:26:50 +10:00
cbdf479b5d
hitsound uses burn else instead of checking brute
2014-09-18 20:05:46 +10:00
d53e8f6a52
Merge branch 'master' of https://github.com/tgstation/-tg-station into breakingrillesisagreatwaytoruinabarbeque
...
Conflicts:
code/game/objects/structures/grille.dm
2014-09-18 19:16:28 +10:00
dff5ed3683
Merge branch 'master' of https://github.com/tgstation/-tg-station into quija
...
Conflicts:
tgstation.dme
2014-09-17 18:24:08 -05:00
40e40af5af
Merge pull request #4845 from Menshin/table_crafting_fix
...
Items table crafting fixing
2014-09-17 13:53:13 -05:00
Remie Richards
MrPerson
Cheridan
tkdrg
phil235
paprka
paprka
Swag McYolosteinen
ikarrus
Hornygranny
Jordie0608