c5b897a951
Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers
2017-02-22 18:24:43 +01:00
cff15468ba
Merge pull request #6478 from FlattestGuitar/lasers
...
New laser carbine icons
2017-02-18 11:07:56 -05:00
e8a04e5524
Laser carbine icons!
2017-02-17 14:21:48 +01:00
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
56dd8b189e
Proper fix for minebot damage issue
2017-02-15 17:23:57 +01:00
519749cf8d
Fix OP minebots, move them into a separate file
2017-02-15 16:21:04 +01:00
924e539f22
Chassis mods now rename KA, remove cost from chassis mods/tracer mods
2017-02-08 19:27:16 +01:00
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
053ff0fbbb
KA energy adjustments
2017-02-08 03:03:45 +01:00
0790ed5f8d
KA fixes, upgrade typo fix
2017-02-08 02:45:13 +01:00
835f68843a
Minor fixes, prevent ABSTRACT items from being summoned
2017-02-07 23:54:50 +01:00
ad2468196e
On Varedit Fixes
2017-02-07 08:44:50 -05:00
96bd88badb
Fix action item message
2017-02-06 20:50:31 +01:00
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
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01:00
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
2b767bb9c9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/mob_helpers.dm
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
0283e75fe5
Merge pull request #6254 from FlattestGuitar/erifle
...
Adds a laser carbine!
2017-01-31 00:43:15 -05:00
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
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
0959e819ec
Merge pull request #6237 from Fox-McCloud/no-pooling
...
Fires all Lifeguards, Bans Diving, and Forbids Swimming...
2017-01-26 03:48:35 -08:00
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
692f2d238b
Adds a laser carbine!
...
Admin only for now.
2017-01-26 12:45:36 +01:00
d0b378892d
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 22:25:00 -05:00
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
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
ea15a83fde
Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage
2017-01-23 01:56:47 -05:00
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
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
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
a6b916fc92
Makes the description generic.
2017-01-16 00:14:30 -05:00
3fbc81cea7
Ports Enforcer handgun, rubber bullets, and new ammoboxes.
2017-01-15 21:13:22 -05:00
ea8080e6c9
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
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
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
3961aa3bcd
Merge pull request #6074 from TullyBurnalot/Splatterdash
...
Wand of Death Reliable Killing
2017-01-10 00:27:23 -08:00
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
63d5b6a1b1
Adds that var to projectile hits printing
2017-01-08 22:15:58 +01:00
ecaf8678ab
Wand of Death now deals Burn
2017-01-07 15:15:17 +00:00
69ff538a02
Readjusts Wand of Death for pure bugfix
2017-01-07 01:06:47 +00:00
614277feed
Wand of Death no longer gibs people, still kills
2017-01-06 12:30:35 +00:00
77371a6730
Wand of Death now gibs people
2017-01-05 22:39:38 +00:00
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
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
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
7a55ec18fc
Merge remote-tracking branch 'upstream/master' into food-rework
2016-12-05 12:40:32 -05:00
e134100164
Hunger Rework
2016-11-28 13:17:46 -05:00
86eac97aa7
Merge pull request #5902 from shazbot194/master
...
fix for l6 description and paper hat sprites
2016-11-23 16:26:07 -05:00
00444598d9
fix for l6 description and paper hat sprites
...
Changes the description of the L6 from 7.62 to 5.56 so it matches both
its ammo and magizine caliber.
Adds in paper_words sprites to head, and hands so when you have a paper
that is writen on, it can both be seen when holding and when wearing as
a hat.
2016-11-22 11:16:32 -09:00
Markolie