5457503c67
adds holographic janitor signs
2014-10-08 13:48:44 -07:00
d61e4ac943
big commit, handcuff overhaul
2014-10-08 13:19:54 -07:00
4c78323aa0
conflict resolution
2014-10-08 11:38:03 -07:00
b8eb9e3587
general code optimizations
2014-10-08 10:10:03 -07:00
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
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
d80be7f689
changes robotics gloves to fingerless gloves
2014-10-08 05:11:30 -07:00
f5e54f1fa8
Merge pull request #5069 from phil235/WindoorDeconstruction
...
Adds windoor deconstruction & bug fixes
2014-10-08 10:27:45 +01:00
c28dd40190
Merge pull request #5085 from paprka/WYATTSHIELDS
...
Adds telescopic riot shields
2014-10-07 21:13:03 -07:00
216682bccf
eyepatch HUD
2014-10-07 19:18:18 -07:00
f96b017149
Merge pull request #5097 from phil235/Msg1Fix
...
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
0e1083fc39
adds zipcuffs
2014-10-06 20:35:10 -07:00
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
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
paprka
Remie Richards
hornygranny
Cheridan
MrPerson
tkdrg
phil235
paprka
Swag McYolosteinen
ikarrus