Commit Graph
873 Commits
Author SHA1 Message Date
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
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 LemonandGitHub f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework
Food rework
2017-01-10 12:11:17 -08:00
Crazy LemonandGitHub 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 7a55ec18fc Merge remote-tracking branch 'upstream/master' into food-rework 2016-12-05 12:40:32 -05:00
Fox-McCloud e134100164 Hunger Rework 2016-11-28 13:17:46 -05:00
Fox McCloudandGitHub 86eac97aa7 Merge pull request #5902 from shazbot194/master
fix for l6 description and paper hat sprites
2016-11-23 16:26:07 -05:00
shazbot194 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
Crazy LemonandGitHub 405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization
Reagent Reorganization
2016-11-21 16:54:41 -08:00
TullyBurnalot 71b64bbb5a Fixes Gun Renaming
- Renaming guns now only produces 1 input box
2016-11-12 01:32:50 +00:00
Fox-McCloud 14e2eb8eb0 consumables 2016-11-08 10:26:29 -05:00
Fox-McCloud 61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Fox McCloudandGitHub 911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Markolie 61daab92f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/modules/mob/living/carbon/human/appearance.dm
2016-10-25 18:31:39 +02:00
Markolie 0bfb2d7612 Bow fix 2016-10-25 14:43:11 +02: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
Markolie 88b2bf1a28 X-01 grammar fix 2016-10-24 16:43:30 +02:00
Crazylemon64 6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie 2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Fox McCloudandGitHub 4874d1c95c Merge pull request #5695 from FlattestGuitar/logs
Renames some bullets so they're easier to track
2016-10-12 17:15:27 -04:00
FlattestGuitar 15684d4850 Only bullets now 2016-10-12 23:07:01 +02:00
shazbot194 b6fef2185c Changed the way smg & toy icon updates.
Switched from using math to fit the icon's name to having the icon's
name fit the math, also changed the normal SMG's mag so it can also
updates properly.
2016-09-25 01:45:38 -08:00
shazbot194 47912cfd43 Small fixes for foam force weapons
-Adds a new icon for the toy tommy gun with a blue muzzle, so it doesn't
have to use the real tommy gun's icon or what is was using, nothing.
-fixes the rounding on the toy smg so it now doesn't have an invisable
magazine when loaded and displays the correct amount of ammo.
2016-09-14 20:11:38 -08:00
shazbot194andFox McCloud da6a80c2f4 Fixed the Riot foam icon (#5676)
* Fixed the Riot foam icon

Adds the varable riot to both normal foam darts and adds some else if
statments to give both darts and modified darts the correct icon.

* Update ammo_casings.dm

* Update ammo_casings.dm

* Update ammo_casings.dm

* Fix for single shot stechkin

changes how the stechin updates it's magazine so the single shot
magazine doesn't go invisable.

* Revert "Fix for single shot stechkin"

This reverts commit 11974996c4.

* changed description

changes the discription and moves it one line down.
2016-09-14 20:42:37 -04:00
Isaac Erwin 8986dca9d8 Now the 45 mag can use all 9 sprites 2016-09-14 14:42:18 -04:00
Isaac Erwin 3a1d07454f Okay, foxxy 2016-09-13 19:27:15 -04:00
Fox McCloudandGitHub c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
jughuandGitHub d9d5b41521 Yaya 2016-09-11 23:36:51 +02:00
Krausus 92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
theColdflameandFox McCloud 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 bc6da3082d Fixes a runtime when a null memo would be attempted to be
displayed to an admin

Null descriptions will no longer `to_chat`

KA now no longer runtimes
2016-08-31 00:27:09 -07:00
TheDZD f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
Fox-McCloud 1f4f4c6cfe Crutch Refactor 2016-08-17 21:45:55 -04:00
Crazylemon64 031dd2bb3d Iiiiit's merge conflict time!
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
Chakirski 1f703104e4 Less stealth more sprite. 2016-08-03 22:54:00 -05: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
TheDZDandGitHub 0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Crazylemon64 bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00