372ecd6233
Merge branch 'master' of https://github.com/tgstation/-tg-station into syndicateshotgunsreturn
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-10-01 20:10:58 -07:00
255254cb69
Merge pull request #5038 from paprka/atmosbelt
...
Utility/medical belts can now hold pocket extinguishers
2014-10-01 21:24:58 -05:00
a8056c6ba7
Merge pull request #4995 from Cheridan/hidey
...
Smuggler Satchels
2014-10-01 22:49:41 -03:00
eae5d0b7af
Smuggler pack can now fit in backpacks itself
...
Fixes some sprite issues
2014-10-01 17:33:08 -05:00
8247ccb866
Merge pull request #4977 from Menshin/structure_lighting_update
...
Makes opaque structures and space vines update surrounding lights when destroyed
2014-10-01 10:27:40 -05:00
6e44354f9d
Merge pull request #4914 from RemieRichards/DroneImprove
...
Drone Improvements - Take 2 PR Boogaloo
2014-10-01 10:16:06 -05:00
6db18cff96
initial commit
2014-09-30 13:41:02 -07:00
93d160ed68
compile fix
2014-09-30 13:14:44 -07:00
b775da4e60
extinguish fires
2014-09-30 12:38:59 -07:00
fa751f2f72
Merge pull request #4975 from phil235/CloneMessages
...
Replacing clone damage descriptions with "cellular damage".
2014-09-30 12:21:42 -05:00
219864312a
Merge pull request #4988 from Miauw62/420
...
Fixes a bunch of saycode things.
2014-09-30 10:23:23 +01:00
7e8e728d85
Merge pull request #4986 from Ikarrus/gangfixes
...
Gang Mode fixes and improvements
2014-09-29 10:33:17 -05:00
d98cf02a3f
Adds smugger packs to mining room, replaces booby-prize beer keg.
...
Adds to uplink_item.dm
Updated code, latest sprites.
2014-09-27 19:59:25 -05:00
ce3dca998b
Adds hidable backpack
2014-09-27 19:26:44 -05:00
0f5fd59c0c
Merge pull request #4919 from Miauw62/tatorbalance
...
Rebalances traitor items.
2014-09-27 17:13:50 -05:00
f0ddaf7d8e
Merge branch 'master' of https://github.com/tgstation/-tg-station into 420
...
Conflicts:
code/modules/admin/admin_verbs.dm
2014-09-27 16:09:31 +02:00
77584d4a7d
Fixes a bunch of saycode things. Objs can now hear radio talk.
...
Added a proper strip_html() function.
Fixed #4959
2014-09-27 16:06:06 +02:00
d9ee81bb96
Merge pull request #4815 from phil235/AudibleMsgFix
...
Simplifying audible messages
2014-09-27 15:01:56 +02:00
131b5ee0ec
- Removes the useless has_been_rev var
...
- Reworded intercept report to discourage security from inadvertently causing a gang to win.
- Recaller use is logged
- Made the text explaining membership visibility more visible
2014-09-26 21:37:07 -06:00
65e38bdfbc
Gang Mode fixes and improvements
...
The first of many. Most caused by horrible merge-related accidents.
- Gang converts are no longer revolutionaries
- Revolution controls show up in the TP again
- Gang added to game_options.txt defaulting to 0
- Clarified some help text strings
2014-09-26 19:27:13 -06:00
a7ddbee033
Makes opaque structures update surrounding lights when destroyed.
...
Fixes #4971 .
2014-09-26 00:13:52 +02:00
231c1f0ea2
Merge branch 'master' of https://github.com/tgstation/-tg-station into CloneMessages
2014-09-25 20:07:29 +02:00
1d9834b159
Adding changelog and correcting a typo
2014-09-25 20:06:01 +02:00
1840d72ae4
reverting to show_message proc in three places.
2014-09-25 19:14:51 +02:00
b00b41bbf9
Replacing clone damage descriptions by "cellular damage".
2014-09-25 19:11:31 +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
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
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
paprka