e1b7477857
Merge pull request #16579 from KorPhaeron/buffs_ignore
...
Ignore Buffs
2016-04-03 18:39:29 -05:00
aa4a46e9de
I'm awful at this sort of math!
2016-04-03 19:34:55 -04:00
89c9e6a3d3
flash
2016-04-03 19:01:38 -04:00
1f191b07ec
visible memessage
2016-04-03 18:41:57 -04:00
e6abb95178
Holoparasite balance
2016-04-03 18:33:20 -04:00
2b3f4394c7
Adds on_species_gain proc to human species
2016-04-03 15:39:55 +03:00
065d6c2851
fixes leftover logic from a previous build.
2016-04-03 00:06:49 +01:00
a3dd455a37
Adds a framework for alternate appearances (override images), the Cardborg costume now makes you look like a real Standard Cyborg
2016-04-02 20:52:00 +01:00
69f9549a11
Ignore Buffs
2016-04-02 10:59:59 -05:00
1467d0d6f1
slowmover
2016-04-02 11:28:43 -04:00
97508e9f33
now has a flash when hit in protection mode
2016-04-02 01:06:26 -04:00
e26aa0636c
the explosion glances off the protector's energy shielding
2016-04-01 18:37:16 -04:00
a8737209a0
a var, a var, i need to make this a var
2016-04-01 16:13:48 -04:00
42a29a8eb6
Adds protector holoparasites
2016-04-01 16:09:54 -04:00
75b350561a
Adding a second argument to mind.transfer_to that forces key movement and fixing rudimentary transformation
2016-04-01 01:32:59 -06:00
82350431b2
Merge pull request #16439 from KorPhaeron/mecha2
...
Mining Gear Balance
2016-03-31 22:10:07 -04:00
2be10e302f
Uses temp overlays for material scanners
2016-03-31 17:15:06 -05:00
f2d5345093
Mesons
2016-03-31 17:02:50 -05:00
1d32467096
Merge pull request #16496 from ChangelingRain/edgecases
...
Fixes edge case where it was possible to get multiple parasites without admin intervention
2016-03-31 12:20:41 -06:00
40023cf843
Merge pull request #16495 from ChangelingRain/dazedzinnia
...
Daisy and Zinnia holoparasites no longer try to kill your eyes
2016-03-31 11:40:15 -05:00
1ff5882696
Merge pull request #16473 from KorPhaeron/goliath_meat
...
Goliath changes
2016-03-31 00:35:13 -06: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
507b48f8a3
Merge pull request #16476 from ChangelingRain/charrrrrrge
...
Adds charger holoparasites to traitor
2016-03-30 21:39:29 -05:00
8372b0f081
Holocarp now dye themselves the colour
...
To be used with the greyscale sprite provided.
2016-03-30 17:22:50 +01:00
e41a62a07d
Moved snowflaking the carp theme to updatetheme()
...
Based on feedback, the changes are now done in updatetheme().
Also with additional biting noises.
2016-03-30 17:01:27 +01:00
20597d0079
Merge pull request #16164 from Robustin/classiczombies
...
Make zombies 2spooky
2016-03-30 16:03:48 +01:00
323ccce61b
Fixes edge case where it was possible to get multiple parasites without admin intervention
2016-03-30 10:08:29 -04:00
6db538ef77
Daisy and Zinnia holoparasites no longer try to kill your eyes
2016-03-30 10:00:22 -04:00
754744d21b
Apparently quotation marks matter
2016-03-30 13:04:03 +01:00
1fd4a2470e
Hooker Green reads better than Hooker's
2016-03-30 12:46:43 +01:00
237bb5c741
HOLOCARP ENGAGE
...
At some point, we'll run out of fish related jokes.
Anyway, put terrible carp descriptions of each of the classes, and changed
the icon of a carp themed guardian to a holocarp. Doesn't change colour.
2016-03-30 12:27:18 +01:00
2b950c3f5a
Time for the holocarp realness
...
Summon your holocarp with your fish sticks. Collect them all!
2016-03-30 11:47:15 +01:00
e6c52aa5b3
Merge pull request #16468 from PKPenguin321/patch-16
...
Scales back grab nerf
2016-03-30 02:27:59 -05: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
ca5b67e119
Explorer Gear
2016-03-30 01:27:22 -05: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
36aedd1da2
Phase 1
...
- Adds skeleton code for airlock forcing
- Buffs Drone health
- Reduces alium growth times
- Buffs alien window health
2016-03-29 12:44:22 -05:00
c5e1303bc1
confixed
2016-03-29 12:35:58 -04:00
166c2127dc
only forces item dropping
2016-03-29 12:30:21 -04:00
da93492418
paper reeeee
2016-03-29 11:49:06 -04:00
c1e992e60c
Merge pull request #16429 from ChangelingRain/datumholoname
...
Holoparasite Theme/Name Datums
2016-03-29 18:22:37 +03:00
4407473896
Adds charger holoparasites to traitor
2016-03-29 10:58:37 -04:00
64a83e6871
Goliath Meat
2016-03-29 03:39:00 -05:00
53fac5b31d
Ruins mining
2016-03-29 03:09:59 -05:00
8337562f41
applies changes to breakout probabilities
...
how come my salt PRs dont get merged but goofballs do
aggro grab:
25 -> 75 -> 50
neckgrab:
5 -> 50 -> 15
2016-03-28 22:17:21 -07:00
6c58930df5
scales back grab nerf
...
original value -> goof value -> new value
grab upgrade timer:
40 -> 100 (>2x bigger than original) -> 60 (1.5x bigger)
killgrab timer:
100 -> 150 -> 100 (didn't need to be changed originally)
readds the stun on neckgrab, but more than halves the duration
undoes the weaken nerf on the killgrab
2016-03-28 22:08:32 -07:00
d371fe770a
Merge pull request #16421 from Iamgoofball/SALTY
...
[#SALTY] GRAB NERF [FUCK] [BALANCE] [#GRABDATNERF]
2016-03-28 22:03:49 -05:00
Cheridan
Nerd Lord
c0
Remie Richards
KorPhaeron
Isratosh
duncathan salt
KorPhaeron
Jack Edge
GunHog
Razharas
PKPenguin321