9a6b11e785
Merge branch 'master' of https://github.com/tgstation/-tg-station into golemship
...
# Conflicts:
# config/admins.txt
2016-04-10 17:13:19 -07:00
af01ed7e00
Golem ship tweaks and additions
2016-04-09 21:19:38 -07:00
84ae3dd731
...
2016-04-09 12:33:32 -04:00
13bb58dbc0
orange prisoner ids now show up in wallets
2016-04-07 19:27:17 -04:00
abe689cac9
Merge pull request #16587 from xxalpha/cigbrand
...
Cigarette packs will brand their cigarettes.
2016-04-05 19:59:09 +02:00
a6cd496c95
Merge pull request #16521 from erwgd/StorageEnhance
...
Exosuit and utility belt enhancements, holster description change
2016-04-04 20:57:03 -05:00
a2a554c48a
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/objects/explosion.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/structures/girders.dm
code/game/objects/structures/grille.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/events/wormholes.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
d6301ff735
Cigarette packs will brand their cigarettes.
...
an
the macros dont work
2016-04-03 10:42:53 +01:00
af51a66e37
Adds sandbags
...
* sandbgs an stuff
* mmmm
* fucking sandbags
* okokok
* aaaaaaaaaaaaaaaaaaaaaah
2016-04-02 23:52:12 -04:00
2c7fda0148
removed a redundant carried in shoulder holster desc
2016-03-31 13:07:47 +01:00
5c90078c5b
Lets you carry gloves in tool, sec, med and jani belts, bounced radios in tool, sec and med, edited shoulder holster description, let you carry handheld crew monitor in labcoats
2016-03-31 12:19:15 +01:00
03216dce2e
Merge pull request #16465 from TehZombehz/foodbox
...
Adds random ingredient food packages to chefs
2016-03-31 04:03:09 -05:00
6fb6da13a7
One line change
2016-03-31 03:54:02 -05:00
229a90ba10
Reorganized for standards
2016-03-31 02:53:52 -05:00
3d95d68b2f
Merge pull request #16279 from Core0verload/HUDfuckery
...
Slot icons micro-refactor
2016-03-30 23:30:06 -06:00
0f26065c64
HOPEFULLY removes conflicts
...
First attempt ev
2016-03-30 17:12:55 -05:00
2e5012e9d4
Typo
...
VEGETARIAN
2016-03-29 19:25:47 -05:00
3f1375ba39
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomZLevels/Cabin.dmm
_maps/RandomZLevels/beach2.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/templates/lavaland_surface_automated_trade_outpost.dmm
_maps/templates/lavaland_surface_biodome_winter.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
code/controllers/subsystem/air.dm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/nuclear/nuclearbomb.dm
code/game/machinery/computer/arcade.dm
code/game/objects/effects/aliens.dm
code/game/objects/effects/overlays.dm
code/game/objects/items/apc_frame.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/girders.dm
code/game/turfs/simulated.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/mineral_floor.dm
code/game/turfs/simulated/floor/plating.dm
code/game/turfs/simulated/river.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/simulated/walls_reinforced.dm
code/modules/admin/verbs/buildmode.dm
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
code/modules/events/spacevine.dm
code/modules/flufftext/Hallucination.dm
code/modules/holodeck/turfs.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/interactive.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/bot/floorbot.dm
code/modules/mob/living/simple_animal/guardian/guardian.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
code/modules/mob/mob_movement.dm
code/modules/power/singularity/narsie.dm
code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
acd351bc15
Type replacement
2016-03-29 08:10:04 -05:00
da31e890ab
Changes Kor requested #1
2016-03-29 01:06:37 -05:00
326eaf17c6
Small compression
2016-03-28 23:26:23 -05:00
e13840ffde
Adds random ingredient food packages to chefs
...
Adds various ingredient boxes, a random one of which is chosen for the
chef to start with. Also adds soysauce bottles preset items.
2016-03-28 22:58:03 -05:00
a6a338ae76
More typo fixing
...
I swear I'm good at english
2016-03-28 02:43:21 -05:00
c83cc45ab2
Regular and smiley paper sack are now wearable if modified
...
Use a sharp object on an empty regular or smiley face paper sack to
craft their respective wearable paper sack hats.
2016-03-28 01:59:44 -05:00
fe35d72828
Requirement to hold paper bag to change design removed
2016-03-28 00:01:50 -05:00
37a3c4373b
Adds craftable paper sacks
...
Adds craftable paper sacks
2016-03-27 23:37:43 -05:00
07ed2d15b6
Merge pull request #16398 from tgstation/duncathan-patch-1
...
Make the BOH warning slightly more helpful
2016-03-27 12:32:24 -05:00
7759b823da
I like trustygun's idea
2016-03-26 14:13:27 -06:00
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
0fd7310f41
Update backpack.dm
2016-03-26 10:08:52 -06:00
ab947d1868
nevermind about that spare shell
2016-03-23 03:08:41 -05:00
79ea910a64
box
2016-03-23 02:56:12 -05:00
b6b8a3eb09
Merge pull request #16260 from Bawhoppen/grenadesholyshithelp
...
Grenade belt for nukeops
2016-03-22 19:35:43 +01:00
f71ab62e79
HUD item slots no longer show item placeholders when there are actual items inside
2016-03-22 08:00:38 +03:00
7627e1c0e2
Merge pull request #15859 from Core0verload/wall_flash
...
Wall mounted flashes are now buildable
2016-03-21 12:32:55 -05:00
4227b97faa
Merge pull request #15667 from kingofkosmos/storagescloseonclick
...
Removes backpack close-button
2016-03-21 03:10:26 -05:00
83624574e5
tkdrg said to name commits something useful
2016-03-20 19:50:22 -05:00
18897ac972
resderved
2016-03-14 23:24:28 +00:00
d206a14644
Fixes
2016-03-12 15:14:50 +03:00
ed8239d840
Wall mounted flashes are now buildable
2016-03-12 15:14:48 +03:00
e469a4d35e
Merge pull request #16018 from PKPenguin321/tactical-bola
...
Bolas update: Traitor items edition
2016-03-11 21:01:24 -05:00
12a6205372
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomRuins/SpaceRuins/asteroid4.dmm
_maps/RandomRuins/SpaceRuins/spacebar.dmm
_maps/RandomZLevels/Academy.dmm
_maps/RandomZLevels/beach.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/spacebattle.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/RandomZLevels/wildwest.dmm
_maps/map_files/AsteroidStation/AsteroidStation.dmm
_maps/map_files/BirdStation/BirdStation.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/DreamStation/z5.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/map_files/generic/z5.dmm
_maps/map_files/generic/z6.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
_maps/templates/lavaland_surface_ufo_crash.dmm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/machinery/computer/arcade.dm
code/game/objects/structures/lattice.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/misc_floor.dm
code/game/turfs/simulated/floor/plasteel_floor.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/bot/cleanbot.dm
code/modules/mob/living/simple_animal/bot/mulebot.dm
code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
08f78d7db9
adds reinforced bolas, tweaks uplink throwing star bundle
...
adds reinforced bolas, they do a Weaken(1) and take twice as long to break out of when compared to normal ones. their sprite has a different color
moves throwing star bundle to uplink_kits.dm from weaponry.dm and makes it use a syndicate box
tweaked the throwing star bundle to be the throwing weapon bundle, updated uplink listing and description accordingly
lowered throwing weapon bundle cost to 5 from 6
2016-03-09 23:02:18 -08:00
d9bca07308
@steelpoint you didn't remove the bundles.
2016-03-09 23:18:53 +00:00
15d8e0a96f
I refactored how a mob resisting out of a closet that is itself inside something is done.
...
Fixes not being able to resist out of an unlocked unwelded locker. Now both moving and the resist button work (except for the cardboard box).
You can no longer spam breakingout message ouf of a closet by moving while inside.
Wrapping and unwrapping a locker no longer unwelds it magically.
I refactored closet/crate/item package wrapping.
You can packagewrap belts and other storage items in which the package wrap item doesn't fit.(it does currently have the unintended side effect of giving you the "doesn't fit in X" message when wrapping there storage items though).
2016-03-03 20:20:34 +01:00
41a42922d2
Merge pull request #15709 from Malkevin/cuffsandclean
...
Cuffs and sec clean up
2016-03-01 20:28:56 -03:00
5127ba71fc
reverts name change, tweaks cost
2016-02-28 11:01:30 -05:00
a3a42b8ef8
Reverts removing the backpack close-button. Modifies the close-button's sprite.
2016-02-28 17:22:22 +02:00
RandomMarine
Nerd Lord
AnturK
KorPhaeron
duncathan
xxalpha
bawhoppen
erwgd
TehZombehz
Cheridan
Xhuis
Lularian
c0
Akke
PKPenguin321
phil235
tkdrg
bgobandit
kingofkosmos