047de23ee0
Reverts chef description and fixes radiation suit label.
2014-11-21 10:59:15 -05:00
9d889797f5
Fixes collectable hat capitalization and changes the descriptions on some items.
2014-11-21 10:24:12 -05:00
2eb28a2a80
Fixes spelling errors in clothing item descriptions and adds/edits descriptions for others.
2014-11-20 23:26:10 -05:00
a2785aaaa8
Merge pull request #5949 from tkdrg/borgalarm
...
Lets borgs interact with air alarm wire panels
2014-11-20 11:21:37 -08:00
b2fba4a48f
Merge pull request #5944 from Jordie0608/orangeslikesgoatbutts
...
Fixes select job equipment cancel
2014-11-20 11:21:13 -08:00
a1efd6cfde
Merge pull request #5946 from tkdrg/tktp
...
Fixes TK teleporting pictures and growns
2014-11-20 13:05:11 -06:00
edf92311cf
Lets borgs interact with air alarm wire panels.
2014-11-20 13:41:56 -03:00
0da09e3f6b
Merge pull request #5557 from Incoming5643/magicmania1.76
...
Magic Mania 1.76: Lets outrun the feature freeze
2014-11-20 09:07:41 -06:00
d55232cdae
Merge pull request #5904 from GunHog/Common_comms_MicOff
...
[MAP] AI's Common Channel intercom mic starts off.
2014-11-20 09:00:11 -06:00
283cd657fe
Merge pull request #5955 from Jordie0608/ideletedmyvdibyaccident
...
Fixes #5951 Uplink implant TC amount description
2014-11-20 08:55:15 -06:00
3c1b446a20
Merge pull request #5916 from Perakp/infiniteAbsorbFix
...
Little absorb bugfixes
2014-11-20 08:43:19 -06:00
8bfed4258b
Merge pull request #5922 from Steelpoint/BeretHoS
...
HoS Beret + Warden Drill Hat
2014-11-19 10:26:27 -06:00
48b60c82a1
Corrects uplink implant desc tc amount
2014-11-19 19:46:06 +11:00
1208c48af3
Merge pull request #5652 from Menshin/atmos_z_level_fix
...
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
c98448b5c2
Merge pull request #5650 from phil235/MechAtkFix1
...
All mechs get a melee attack
2014-11-18 12:53:52 -06:00
0db30a6534
Fixes issues with TK teleporting pictures and harvested plants.
2014-11-18 15:49:03 -03:00
ce6a1d0d89
Fixes select job equipment cancel
2014-11-18 22:50:33 +11:00
87fe5489a7
Merge pull request #5701 from tkdrg/outoftheleftfield
...
Containment fiels bounce structure, machinery & mechs, take two
2014-11-18 04:39:48 +03:00
59aa177af7
Merge pull request #5681 from Menshin/singulo_beacon_fix
...
Singularity beacon fix and clean-up
2014-11-18 04:19:00 +03:00
e205c8f2f6
Merge pull request #5857 from paprka/lolnames
...
Fixes a bunch of capitalization inconsistencies, adds names to vendors
2014-11-18 03:46:26 +03:00
2d8f36acf6
Merge pull request #5891 from Intigracy/whenlifegivesyoudronescommitgenocide
...
Drones now look like scorpions, fixes blue drone being horrible eyesore
2014-11-18 03:44:40 +03:00
1236f822d6
Conflict solving
2014-11-17 22:38:22 +01:00
5e68e30389
Merge pull request #5874 from phil235/MMIMechaFix
...
Drones and silicons can no longer enter mechas.
2014-11-17 14:00:09 -06:00
639594c7f9
Merge pull request #5890 from Jordie0608/iwhoopsedalloverit
...
Fixes #5840 Improves stun baton messages
2014-11-17 11:46:06 -08:00
1111c9caa7
Merge pull request #5915 from tkdrg/hugs
...
Fixes a couple facehugger bugs
2014-11-17 11:38:57 -08:00
53d913bc7f
Merge pull request #5924 from tkdrg/junk
...
Removes unticked unused code from the tree
2014-11-17 13:34:49 -06:00
85f735c504
Merge pull request #5878 from phil235/DroneShardFix
...
Fixes drones cutting their hands when using shards.
2014-11-17 09:55:19 +00:00
2138e1d2c7
Merge pull request #5884 from tkdrg/ionblastUSA
...
Moves the ion law picklists to an external txt
2014-11-17 09:48:04 +00:00
82d1af3ed9
Merge pull request #5888 from Menshin/supply_comp_href_fix
...
Cargo shuttle href exploit fixed + orderable syndi crates
2014-11-17 09:43:02 +00:00
f69f81c8c2
fixes fuel tank crate
2014-11-16 12:34:11 -08:00
5a7e4a30d9
Merge remote-tracking branch 'remotes/upstream/master' into Common_comms_MicOff
...
Conflicts:
_maps/map_files/MetaStation.v39K.dmm
_maps/map_files/tgstation.2.1.3.dmm
2014-11-16 13:56:41 -06:00
608dec814e
Removes old/unused code from the tree. Use version control if you need it for some reason.
2014-11-16 16:53:18 -03:00
6fba9b3a19
Merge pull request #5688 from Jordie0608/isitpronouncedlockorloch
...
Fixes #5613 null acid loc
2014-11-16 20:22:08 +03:00
03a98a6295
HoSBeret
2014-11-16 22:32:01 +08:00
54299ac9b4
Merge pull request #5812 from fleure/nozfix
...
Fixes nozzle deleting and adds some safety to nozzle toggling
2014-11-16 13:44:42 +03:00
8ac40af6ef
- Fixes being able to absorb same target multiple times by spam clicking the absorb button
...
- Fixes being able to absorb husks
2014-11-16 12:01:57 +02:00
e05dbe3b27
Fixes facehuger bugs
2014-11-16 03:26:27 -03:00
509c07650f
Merge pull request #5802 from paprka/EATITFATTY
...
Clothing sprite/file path changes
2014-11-15 20:28:43 -08:00
ac6d5b9558
Merge pull request #5861 from tkdrg/moarfloors
...
Floor refactor MkII
2014-11-15 20:13:50 -08:00
5a8c19009a
black visor for syndie helm
2014-11-15 15:42:49 -08:00
4a4b39b57f
fixes the spider pathing
2014-11-15 14:55:48 -05:00
fbbc77f905
Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76
...
Conflicts:
code/modules/projectiles/projectile/magic.dm
2014-11-15 14:44:51 -05:00
408ae33052
[MAP] AI's Common Channel intercom mic starts off.
...
Edits Box and MetaStation maps so that all three AIs start with the
microphone on their Common Channel intercoms off.
This partially addresses #5860 . I wanted to keep this PR a pure map
change, as dealing with maps is a pure nightmare for both me and any
other coders with a map PR.
Full solution for the arrivals announcement and law broadcasts will be
in another PR.
2014-11-15 12:48:22 -06:00
24c0c3d941
Merge pull request #5889 from Aranclanos/phazonchassis
...
Fixes phazon chassis availability in the mech fabricator
2014-11-15 20:39:36 +03:00
7d8b12bd43
Merge pull request #5896 from Menshin/nagging_debug_message
...
Removed nagging debug message
2014-11-14 17:19:15 -08:00
a926e68e31
Removed nagging debug message.
2014-11-15 02:17:22 +01:00
70f4cd24ef
Floor refactor MkII: Fixes a few potential bugs
2014-11-14 21:36:45 -03:00
2ec1658be0
Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx
...
Moving carbon/middleclickon() form carbon.dm to click.dm
2014-11-15 02:51:24 +03:00
5efd78d14b
now there's consistency
...
oh and also drones are now scorpions
2014-11-14 14:24:44 -08:00
2ab5701b97
Merge branch 'lolnames' of https://github.com/paprka/-tg-station into lolnames
2014-11-14 14:09:44 -08:00
Xhuis
hornygranny
Cheridan
tkdrg
Jordie
Razharas
Menshin
Remie Richards
paprka
GunHog
Steelpoint
Perakp
Incoming
Menshin
Intigracy