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
589c1f4cbb
Botcall, TG edition!
2014-09-25 09:44:41 -05:00
013a1b1a3f
Merge pull request #4918 from Aranclanos/eletropack
...
Adds the eletropack to the radio controller objects, so they work again.
2014-09-25 08:52:00 -05: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
8ab6bf0c15
Super Awesome Crayons!
2014-09-24 22:19:12 +04:00
f9e17faca3
Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
...
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
78ce564314
Merge pull request #4871 from phil235/FlashPowderthing
...
Fixes #4176
2014-09-24 16:55:49 +02:00
a9d609bc9b
Merge pull request #4802 from Menshin/stacks_merging_cleaning
...
Crafted stacks merging cleaning
2014-09-24 12:04:07 +01:00
8aa5fd2ff6
ishuman changed to istype for previously defined scope
2014-09-23 10:43:26 -07:00
ff5ec967eb
Merge pull request #4917 from Jordie0608/plastiqueisoldfrechforplasticexplosives
...
Standardizes name and path of plastique/plastic explosive/c4 to C4
2014-09-23 09:02:43 -05:00
9fc6fccf17
Merge pull request #4616 from Ikarrus/revvsrev
...
Gang Mode for TG
2014-09-22 20:28:47 +02:00
619b7beede
Syndie bundle adjustments. Made the emag one TC more expensive.
2014-09-22 18:37:27 +02: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
eabe1f4491
Resolved conflicts and addressed maintainer feedback.
2014-09-21 15:30:54 -06:00
a4d9d70678
Merge pull request #4910 from Miauw62/blblblblblb
...
Fixes radio MMIs turning exofabs into radios.
2014-09-21 16:20:39 -05:00
be079897e1
Adds default toolbox for drones, Moves drone hud to drone hud file, ticks drone hud file.
2014-09-21 20:39:29 +01:00
899d967953
Doubles the amount of TC and the prices of uplink items.
...
Stealthy items have been slightly decreased in price.
Weapons have been slightly increased in price.
Nuke items remain mostly unchanged.
2014-09-21 15:56:24 +02:00
d156f4770a
Adds the eletropack to the radio controller objects, so they work again.
2014-09-21 05:16:02 -03:00
facb2744cb
Standardizes name and path of plastique/plastic explosive/c4 to C4
2014-09-21 17:34:26 +10:00
7356d49b04
Adds some missing drone things from the previous PR:
...
+Missing head/mask slot because drones.dm is not currently being compiled
+Missing weapon/storage not allowing drones to MouseDrop
+Missing uplink buy() preventing non-humans to use it
+Missing syndrone sprites
Adds new drone things that weren't in the previous PR:
+Drone pings respect factions
+Moved drone ping message functionality into its own proc
+Alerts all drones about newly activated/reactivated drones
+Alerts all drones about dead drones
+Gives the syndrone the "syndicate" faction, overriding the default "neutral"
->Redirected gib() to dust()
->Redirected update_inv_l_hand() to update_inv_hands()
->Redirected update_inv_r_hand() to update_inv_hands()
->Redirected update_inv_wear_mask() to update_inv_head()
2014-09-21 01:20:20 -04:00
4616ca7c63
Merge pull request #4764 from hornygranny/tableclimbing
...
humans can climb onto tables
2014-09-20 16:58:20 -05:00
4f5431c136
Merge pull request #4899 from Perakp/conehat
...
Wear those warning cones like you always wanted to
2014-09-20 16:46:38 -05:00
e66f74439a
Fixes radio MMIs turning exofabs into radios.
...
Also removed the obsolete GLOBAL_RADIO_TYPE variable.
2014-09-20 15:19:29 +02:00
7f059a82fa
changed stun to Stun() :^)
2014-09-19 22:31:54 -07:00
86bd60aed7
Merge pull request #4874 from xxalpha/master
...
Cigarettes box capacity modified to hold rollies and lighers.
2014-09-19 22:43:59 +01:00
c1449e4827
Cigarette packs can now hold lighters. Now with thought and effort put into it!
2014-09-19 22:22:59 +01: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
3f451f9b1b
Warning cones can be worn on your head, with original codersprites.
2014-09-19 22:44:59 +03:00
6dde12b8ed
Merge pull request #4838 from Jordie0608/breakingrillesisagreatwaytoruinabarbeque
...
Updates grille damages Fixes #796
2014-09-19 18:46:14 +01:00
fb15795f2b
Revert "Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them"
2014-09-19 13:38:10 -03:00
7c32420497
Resolved conflicts and added my yml changelog file
2014-09-19 09:30:59 -06:00
9458d30d3a
Merge pull request #4718 from Perakp/wetShower
...
Showers wet the floor
2014-09-19 16:28:04 +01:00
49bf678e7f
Merge pull request #4440 from Ikarrus/antagjobbans_actually_worth_a_damn
...
Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
2014-09-19 16:00:29 +01:00
7a32582db9
Merge pull request #4745 from Perakp/miningScanner
...
Mining scanner scans automatically, similar to t-ray scanner.
2014-09-19 09:43:32 -05: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
a929c42d29
Cigarettes box capacity modified to hold rollies and lighers.
2014-09-18 00:26:43 +01: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
f5bf1ddaa9
Merge pull request #4809 from RemieRichards/Drones
...
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
b756450d45
Fixes flash powder only checking for sunglasses protection.
...
Simplify the flashbang prime() proc a bit.
2014-09-17 22:48:02 +02:00
40e40af5af
Merge pull request #4845 from Menshin/table_crafting_fix
...
Items table crafting fixing
2014-09-17 13:53:13 -05:00
fabc50fa40
Merge pull request #4857 from Donkie/echair
...
Removes e-chair toggle verb. Fixes #4853
2014-09-17 10:33:48 -05:00
83390797cb
Merge pull request #4844 from phil235/TypoFix
...
Fixing typos.!
2014-09-17 10:13:21 -05:00
4fc4037939
Prevent displaced girders from being secured or build on if on a forbidden turf (space, shuttle, ...)
...
Fixes #4436 (at least partially)
2014-09-16 23:47:26 +02:00
phil235
ikarrus
GunHog
Cheridan
Hornygranny
Lo6a4evskiy
Swag McYolosteinen
Remie Richards
Aranclanos
Jordie0608
JJRcop
xxalpha
Perakp
Menshin