f5b7a6cd0c
Merge pull request #16493 from Isratosh/explosionlogs
...
Adding an admin jump href to explosion logs
2016-03-31 11:49:06 -06: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
97877c0b2f
Merge pull request #16487 from Supermichael777/BZZZZT
...
Makes Grills ZAP things when shit gets tossed at them.
2016-03-31 01:42:58 -05:00
3d95d68b2f
Merge pull request #16279 from Core0verload/HUDfuckery
...
Slot icons micro-refactor
2016-03-30 23:30:06 -06:00
eeb0119acb
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/gamemodes/nuclear/nuclearbomb.dm
code/modules/mob/mob_movement.dm
code/modules/recycling/conveyor2.dm
2016-03-30 22:55:00 -06:00
0f26065c64
HOPEFULLY removes conflicts
...
First attempt ev
2016-03-30 17:12:55 -05:00
9f3694ba40
Changed materials of wired rod to account for cable restraints
2016-03-30 22:22:06 +01:00
d50cc41180
Gave cablecuffs and spear materials list, removed materials from zipties
2016-03-30 22:02:12 +01:00
b388e76f9c
Knives and thermal protection
2016-03-30 13:28:38 -05:00
11e20a42ca
Adding an admin jump href to explosion logs
2016-03-30 04:19:08 -06:00
e3dcebc65e
Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2
...
# Conflicts:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
2016-03-30 02:12:20 -05:00
b525ae0273
I cannot into code too deep
2016-03-30 00:14:14 -04:00
1d3e9b1817
thanks to remie for reminding me to check things
2016-03-30 00:00:11 -04:00
22f42d497a
oooopps
2016-03-29 23:51:18 -04:00
11e0a04f78
BZZZZT
2016-03-29 23:44:52 -04:00
5ff2020202
Merge pull request #16357 from Iamgoofball/fast
...
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
2016-03-29 20:06:55 -06:00
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06: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
0bb49b1a97
Merge pull request #16440 from TehZombehz/papersack
...
Adds craftable paper sacks
2016-03-29 11:27:41 -05:00
acd351bc15
Type replacement
2016-03-29 08:10:04 -05:00
53fac5b31d
Ruins mining
2016-03-29 03:09:59 -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
9bb1408040
Merge pull request #16424 from RemieRichards/bee_fixes
...
Bee fixes and updates!
2016-03-28 13:49:42 -05:00
8c49ed7053
Merge pull request #16408 from Iamgoofball/patch-14
...
DEFIB: Splits up "no heart" and "body too old" messages
2016-03-28 12:23:35 -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
7a109c5fd0
neutrality preserved
2016-03-27 23:46:49 -05:00
275b3dcc96
lootspawner additions
2016-03-27 23:37:45 -05:00
37a3c4373b
Adds craftable paper sacks
...
Adds craftable paper sacks
2016-03-27 23:37:43 -05:00
17defb66d4
Bee fixes and updates!
...
* Added the ability to make Apiaries and Honey frames with wood
* Added the ability to make Royal Bee Jelly from 10 Mutagen and 40 Honey
* Added the ability to make more Queen Bees from Royal Bee Jelly by using it on an existing Queen, to split her into two Queens
* Made homeless bees more obvious
* Fixed a typo that made almost all bees homeless, severely reducing the odds of getting honeycomb
* Made bee progress reports (50% towards new honeycomb, etc.) always show, even if it's 0%
* Made some feedback text more obvious
* Fixed being able to duplicate the bee holder object, this was not exploity, just weird
* Fixed being able to put two (or more) queens in the same apiary
* Fixed some runtimes from hydro code assuming a plant gene exists
* Fixed runtime when you use a honeycomb in your hand
* It now takes and uses 5u of a reagent to give a bee that reagent
* Removed unused icon file
2016-03-27 21:07:53 +01:00
40e766c6d0
AAAAAAAAAAAAAAAAA
2016-03-27 12:04:33 -07: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
f0a0410bfb
Merge pull request #16385 from KorPhaeron/FREEGOLEM
...
Adds missing file for FREE GOLEMS
2016-03-27 11:37:54 -05:00
eeeff80e5f
Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues
...
Fix bundle
2016-03-26 21:06:00 -05:00
32ef4ffe0a
Optimizations, statue changes
2016-03-26 21:24:10 -04:00
a8121204fe
Merge pull request #16362 from Bawhoppen/minormedicalbuff
...
makes bruise packs and ointment not shit
2016-03-26 20:12:56 -05:00
8a4c356e99
DEFIB: Splits up "no heart" and "body too old" messages
...
This was confusing new players.
2016-03-26 16:12:09 -07:00
91f618a5a7
Atmospheric readings are now accurate to 0.01%
2016-03-26 13:43:20 -07:00
7759b823da
I like trustygun's idea
2016-03-26 14:13:27 -06:00
004e59864a
Merge pull request #16261 from Core0verload/pda_close
...
Kills snowflakey PDA close button
2016-03-26 14:30:07 -05:00
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
duncathan salt
erwgd
KorPhaeron
TehZombehz
Cheridan
KorPhaeron
Isratosh
Supermichael777
bawhoppen
Lularian
Remie Richards
AndrewJacksonThe2nd
Xhuis
Iamgoofball
Tytynguyen