Markolie
7a4c33bbcd
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
2017-02-06 19:55:37 +01:00
Markolie
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01:00
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
Markolie
1d7de41acb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/pooling/pool.dm
2017-01-27 17:28:14 +01:00
Fox-McCloud
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
Crazy Lemon
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
Fox-McCloud
d0b378892d
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 22:25:00 -05:00
Markolie
a7205cfd3e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/projectiles.dmi
2017-01-23 17:36:37 +01:00
Fox McCloud
2af1f9bb79
Merge pull request #6185 from Allfd/Enforcer
...
Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus
2017-01-23 06:08:36 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
Alffd
3fbc81cea7
Ports Enforcer handgun, rubber bullets, and new ammoboxes.
2017-01-15 21:13:22 -05:00
Fox-McCloud
ea8080e6c9
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
Markolie
f85e8fe551
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station.dm
# icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Crazy Lemon
3961aa3bcd
Merge pull request #6074 from TullyBurnalot/Splatterdash
...
Wand of Death Reliable Killing
2017-01-10 00:27:23 -08:00
Markolie
0adc370d55
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/game/machinery/turrets.dm
2017-01-09 22:00:31 +01:00
Mieszko Jędrzejczak
63d5b6a1b1
Adds that var to projectile hits printing
2017-01-08 22:15:58 +01:00
TullyBurnalot
ecaf8678ab
Wand of Death now deals Burn
2017-01-07 15:15:17 +00:00
TullyBurnalot
69ff538a02
Readjusts Wand of Death for pure bugfix
2017-01-07 01:06:47 +00:00
TullyBurnalot
614277feed
Wand of Death no longer gibs people, still kills
2017-01-06 12:30:35 +00:00
TullyBurnalot
77371a6730
Wand of Death now gibs people
2017-01-05 22:39:38 +00:00
Markolie
8609157751
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
# code/_globalvars/mapping.dm
# code/game/objects/effects/landmarks.dm
2016-12-30 00:17:56 +01:00
FalseIncarnate
164585e9da
Snow Wars Episode II: Attack of the Claus
...
Santa's back, and angrier than ever at the naughty spacestation crew!
Santa's maximum health now increases with each successive stage
(previously only increased at Stage 4)
- Stage 1: 150 health (unchanged)
- Stage 2: 200 health (what stage 4 used to be)
- Stage 3: 250 health
- Stage 4: 300 health
Santa's Melee forms have had their damage ranges buffed
- Previously 5-15 in Stage 1 and 15-25 in Stage 4, now 10-20 and 20-30
respectively
Melee Snowmen and Reindeer have had their health increased to provide
extra survivability as they attempt to get into attack range. Ranged
snowmen unchanged
- Snowmen: was 50, now 75
- Reindeer: was 50, now 80
Ranged snowmen can no longer drop the candy cane sword, as intended.
Drop chance unchanged (50% from melee snowmen)
Snowballs (ranged snowman attack) and Ornaments (Santa Stage 2 and Stage
3 attack) have had damage increased slightly. Ornament knockback
unchanged.
- Snowballs now deal 4 damage, was 3
- Ornaments now deal 7 damage, was 5
The away_mission_config.txt file in the /config folder will need to be
manually editted to reactivate the evil santa away mission.
2016-12-24 02:24:40 -05:00
Markolie
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Fox-McCloud
e134100164
Hunger Rework
2016-11-28 13:17:46 -05:00
Fox-McCloud
14e2eb8eb0
consumables
2016-11-08 10:26:29 -05:00
Markolie
e5c4b78f47
Add Colossus, add outdoors variable to areas and update fireball targeting
2016-10-25 04:10:52 +02:00
Markolie
5ace926e42
Added Bubblegum. Added dismemberment chance to bullets, and made changes to GPS tracking.
2016-10-25 00:50:31 +02:00
Crazylemon64
6a7f7394a8
Ports over the status effect unification
2016-10-23 15:45:35 -07:00
FlattestGuitar
15684d4850
Only bullets now
2016-10-12 23:07:01 +02:00
theColdflame
4373165e21
Adds additional variants of 10mm ammunition. ( #5596 )
...
* adds variants of 10mm ammunition
you can shoot people with it
* ones which work
* third time's the charm
* adds the letter 'u'
* makes armor pen values more reasonable
* rebalanced AP
2016-09-04 09:38:39 -04:00
Crazylemon64
6ca037d9f4
Makes things more consistent
2016-08-02 11:27:28 -07:00
Crazylemon64
bc93078da5
Merge conflicts begone
2016-08-01 18:28:47 -07:00
TheDZD
4a818f865c
Merge pull request #5159 from Fox-McCloud/bola
...
Adds in Bola, Other Recipe Tweaks
2016-07-24 23:37:24 -04:00
TheDZD
79d51a57da
Refactors telegun, mimicgun, and tempgun
2016-07-22 16:08:17 -04:00
Fox-McCloud
fe8ef6ca69
Adds in Bola, Other Recipe Tweaks
2016-07-22 13:20:09 -04:00
Tigercat2000
71e5344a98
Mass replace
2016-07-07 19:34:02 -07:00
TheDZD
83f42a3e69
Mimic Gun and Gun Fixes ( #4699 )
...
* Mimic gun and gun tweaks/fixes
* Overlays
2016-06-19 13:14:33 -04:00
TheDZD
cc2766e7d7
Deathwands and googly eyes ( #4653 )
2016-06-13 23:07:13 -04:00
TheDZD
8b8dd41d36
Fixes
2016-06-03 23:41:54 -04:00
TheDZD
f17f4ccdeb
Crossbows and piescannons
2016-06-02 22:17:19 -04:00
TheDZD
f7d4cbe108
Fixes paths, snipers, turrets, mechas, some other things.
2016-05-31 22:50:59 -04:00
TheDZD
8dcf46bf91
Sprites & fixes
2016-05-31 22:50:57 -04:00
TheDZD
a4e950d21a
Compiles, and guns work™
2016-05-31 22:50:55 -04:00
TheDZD
95d7a68a75
Here we go again...
2016-05-31 22:50:53 -04:00
Fox McCloud
110958860b
Merge pull request #4270 from FlattestGuitar/foamforce
...
Ports /tg/ FOAM FORCE
2016-04-27 11:43:55 -04:00
Mieszko Jędrzejczak
d35248366a
Thingies don't embed, icons work.
2016-04-26 11:30:52 +02:00
