d67feceb07
Forgot to close the span
2016-04-08 18:26:58 -05:00
8ed74088c1
Dropper change
...
- Droppers once again work on all mobs, but now do not work on aliens.
1000% more snowflake yet less anger inducing!
2016-04-08 18:25:23 -05:00
6725a2e682
Membrane change, dropper nerf
...
- Droppers now only work on human mobs
- Resin membranes now block lasers.
2016-04-07 18:04:12 -05:00
497a4efc70
makes atmos_spawn_air() use the new gas string parser
2016-04-04 01:49:09 -06:00
cf4ffc2781
Merge pull request #16026 from duncathan/turfs
...
[REVIEW-READY] removes simulated turfs (and asteroid station)
2016-04-04 01:49:45 -05:00
40daf9ec34
fixes the tricord recipe because I cannot into spelling.
2016-04-03 19:32:38 -07:00
2d41f26541
Merge pull request #16515 from TechnoAlchemisto/spoof_chem
...
Re-adds the recipes for Kelotane, Bicardine, Antitoxin, and Tricordazine.
2016-04-03 20:31:18 -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
bcedee0f42
OOPS
2016-04-02 23:49:27 -04:00
059666660f
Fixes chem_reactions to proper names,
2016-03-31 15:05:10 -07:00
38e971feb8
Fixes spelling
2016-03-31 02:08:16 -07:00
7678e68c4e
:^)
2016-03-30 22:16:42 -07:00
0862131ac5
:^)
2016-03-30 22:15:12 -07:00
c1bae85f6b
:^)
2016-03-30 22:10:15 -07:00
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06: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
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
12d1562005
Merge pull request #16365 from Supermichael777/patchpatch
...
Adds delay to patches
2016-03-26 20:12:15 -05:00
621b2ec948
fixes from local testing
2016-03-25 15:37:45 -04:00
80688df26c
and adds the actual delay
2016-03-25 15:00:35 -04:00
c141cc59a2
updates pills to alow for a delay because inheritance
2016-03-25 14:58:35 -04:00
209884a516
Merge pull request #16262 from RemieRichards/BEES_glorious_BEES
...
Reagent Bees Revengenace
2016-03-24 21:45:31 +01:00
7c2203857c
Merge pull request #16147 from Xhuis/bacchus_approves
...
Alcohol Refactor (Merge-Ready)
2016-03-24 19:05:56 +01:00
b9a2c7fdfe
Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES
...
Conflicts:
icons/mob/head.dmi
2016-03-23 15:41:58 +00:00
c22fa4b907
Buffs CLF3
...
>maxcap CLF3 foam
>thunderdome
>total of 2 burned tiles and a single plating was made
yeah no
this is CLF3
🆑
rscadd: CLF3 now melts, burns, and destroys floors a lot more often, as it should be.
rscadd: CLF3 now makes 3x3 fireballs on tiles it touches now, instead of a single fireball.
/🆑
2016-03-21 23:51:01 -07:00
916e1cada0
Modifies alcohol poisoning formula, thanks to @phil235
2016-03-21 17:03:19 -04:00
ed8ca553b4
Fixes, Improvements, Feedback - Wave 1
2016-03-21 18:05:28 +00:00
a29aba94e9
Merge pull request #16206 from JJRcop/JJRcop-patch-1-1
...
buffs milk for skeletons and plasmamen (not stolen)
2016-03-21 03:59:54 -05:00
be0b16a6aa
Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder.
...
Beeboxes have honey_frames which determine the amount of honeycomb+bees they can maintain.
Bees now have a beegent (Bee reagent, geddit?) that they use during their attacks AND that their produced honeycomb contains, this allows you to farm chemicals using bees.
2016-03-21 04:51:16 +00:00
28a767043a
A few more optimizations
2016-03-20 12:21:14 -04:00
0b28d11e48
Fun removal
2016-03-19 23:38:06 -04:00
ce7118c893
Implements @phil235's recommended changes
2016-03-19 23:37:10 -04:00
9a6e95e336
Merge pull request #16047 from RandomMarine/hallelujah
...
Adds holy hand grenades.
2016-03-19 21:43:48 -05:00
b5f0726028
Code optimization
2016-03-19 17:34:42 -04:00
c461128a56
Alcohol refactor
2016-03-19 16:09:43 -04:00
7336988381
maybe this will work
2016-03-19 13:30:37 -04:00
f2c45014fc
buffs milk for skeletons and plasmamen
2016-03-19 02:26:23 -04:00
f3f598225e
Merge pull request #16129 from KorPhaeron/mutagen
...
Adds a mutagen dispenser
2016-03-17 17:46:37 -04:00
4cb3a2b9be
Mutagen Dispenser
2016-03-15 09:37:43 -05:00
3b49362183
full damage
2016-03-12 23:52:42 -05:00
bd9ec70179
blob tuning
2016-03-12 23:34:29 -05:00
ee61367807
Merge pull request #16040 from Boredone/master
...
Replaces Mediborg Acid Spray with Poison Hypospray
2016-03-12 13:54:54 -06:00
93e418dbb7
Holy explosions do bad things to unholy things.
2016-03-11 14:52:55 -08:00
198e81d82f
Switched out Teslium for Lexorin
2016-03-11 14:38:14 -07:00
18e9976567
Adds holywater/potassium reaction
2016-03-11 10:54:19 -08:00
1f2a9811ff
Merge pull request #16020 from ChangelingRain/bonuschemtweaks
...
Tweaks Boiling Oil and Flammable Goo
2016-03-11 17:34:52 +01:00
6bfe0e921a
This replaces the FAcid spray on Mediborgs with a Poisonous Hypospray
2016-03-11 01:52:59 -07: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
GunHog
duncathan
Cheridan
TechnoAlchemist
KorPhaeron
Supermichael777
Remie Richards
AnturK
phil235
Iamgoofball
Xhuis
JJRcop
JJRcop
Joan Lung
KorPhaeron
RandomMarine
Boredone