Commit Graph

234 Commits

Author SHA1 Message Date
variableundefined
c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
variableundefined
c96eebb767 Merge pull request #9401 from shazbot194/9mm-enforcers
Updates Enforcers
2018-10-08 08:12:25 +08:00
Birdtalon
f36b0a4bff changes equip_to_slot_or_del() to equip_or_collect() to prevent item deletion from backpack_contents list
numerous bugfixes
adds new suit sprites
2018-10-07 22:32:44 +01:00
shazbot194
400b237ba2 Oops, fixes foam enforcer icon 2018-08-26 01:58:17 -08:00
shazbot194
e2d7eb0800 Removes a bit more unneeded code 2018-08-26 01:56:27 -08:00
shazbot194
5fa2b58f33 Removes new icons 2018-08-26 01:52:38 -08:00
shazbot194
939cefcca0 Updates Enforcers 2018-08-22 18:48:01 -08:00
shazbot194
9d3c58eee9 Fixes sawing off 2018-08-08 10:24:17 -08:00
Crazy Lemon
bfb00912af Merge pull request #9113 from shazbot194/Shotguns_mk2
Shortening Sawn off Shotguns
2018-08-03 13:43:24 -07:00
shazbot194
b82393790e Code Improvements 2018-07-12 16:40:21 -08:00
Fox McCloud
6c9f83f685 Stechkin Maintenance Pistol Change 2018-06-30 19:24:56 -04:00
shazbot194
6b8da9ca13 Adds in all the stuff from the last one 2018-06-13 20:22:17 -08:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
shazbot194
0a9a3c2b2b More icons for the M90 (#8738) 2018-03-19 13:20:31 -07:00
Crazy Lemon
d66434120a Merge pull request #7869 from shazbot194/Enforcer_upgrade
New enforcer sprites, adds suppressor and flashlight support, and a trainer
2017-08-31 17:44:15 -07:00
shazbot194
02bc43b20e Small sprite update
Changes in description
2017-07-28 23:43:34 -08:00
shazbot194
8fcf5e0cec Now with lights
LIGHT
2017-07-26 19:26:51 -08:00
shazbot194
e2415a74f6 Adds in more colors, suppresors, and a trainer
read desc for more deteails.
2017-07-25 14:29:41 -08:00
shazbot194
2401d28895 New enforcer sprites
adds in new enforcer sprites
2017-07-24 20:56:21 -08:00
Aurorablade
476cdc3e06 Blood Refactor (#6220)
* commit for branch swap

* branch swap again

* BLEED

* trying to clear up compile errors

* i killed everything when i tested this...

* restorealltheblood

* I REMOVED A THING

* well some progress

* stop bleeding

* got to swap branches again.

* grr

* damn bloodcolors

* Squash everything

* color....colourrrrrrr

* color....colourrrrrrr

* well now that updated the branch...

* Changes

* Some tweaks..before i upload something major

* COLOR NOT COLOUR...COLOR

YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD

* Foot print shit..

blood coloring is going to be PAIN

* trying to handle some colors..maybe.

* blood colorsing sucks..di i mention this?

* commenting cod malfunctions.

* Changes

* lets try this

* Its too late at night.

* blargh

* woops

* almost works...

* progress..

* Branch swap

* figured out the overlay issue....

* BRANCH SWAP

* BLARGH

* fixed merged conflicts..expect something to be horribly wrong.

* bunch of changes

* Major Fixes

 - Moved blood_state and bloodiness var definitions to
 /obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
 order to make blood color work properly.
   - These were not used by any other decal, so it was pointless.
 - Tweaked human/add_blood so that hand_blood_color uses the correct
 value now.
 - Corrected gibs having the wrong basecolor.
 - Tracks of different blood colors will no longer combine weirdly, and
 will instead form seperate overlays.
   - This also fixes all of the issues with tracks in general and not
   updating correctly.
 - Fixed transfering blood in add_fingerprint; the old detective code
 didn't use the new format for add_blood().
 - Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
 own trails. Sprites should probably be brightened later.
 - Fixed mobs occasionally randomly having their blood_DNA list reset.

* may have accidently removed shit.

* Mrowl

* stiff

water is not bleeding
lowered trail making threshold

* tweaks then conflcits

* weee

* indent

* some tweaks

* somefox tweaks.

* derp

* why won't they bleed!?

* BLEED DAMMIT

* Flattist comments and removes simple animale blood volume

Cause i cannot get it to work right.

* PRAISE FLATTIST

* Simple animals have a blood volume now

Bug with trail fixed.

* changes

* thanksmrowlmrowl

* exotice blood trails

* makesure is an exotic bleeder has a bleed rate first...

* FoxBoxTweakSox

* BoxVoxSoXFox

* ONE MORE THING

* animalsbleedreds

* Buh? BUGH!

* thisismescreaming

* removing note needed thing

* Color changes but the rabbit hole continues.

* This is not pretty....

* wot

* IT WORKS DAMMIT

* colors.

* germaphobic commit..

* we have to use the old system

* nothing to see here

* doubleprocarady

* try to fix mulebots

* mulebot fixed

* DONE
2017-07-11 16:49:11 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Sam
c1cc319f62 Uses more intent defines 2017-06-03 18:29:50 +01:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox-McCloud
182dcd93b5 autolathe receivers 2017-03-24 16:57:25 -04:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Mieszko Jędrzejczak
e8a04e5524 Laser carbine icons! 2017-02-17 14:21:48 +01:00
Markolie
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
Fox McCloud
0283e75fe5 Merge pull request #6254 from FlattestGuitar/erifle
Adds a laser carbine!
2017-01-31 00:43:15 -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
Crazy Lemon
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
FlattestGuitar
692f2d238b Adds a laser carbine!
Admin only for now.
2017-01-26 12:45:36 +01: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
ea15a83fde Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage 2017-01-23 01:56:47 -05:00
Alffd
a6b916fc92 Makes the description generic. 2017-01-16 00:14:30 -05:00
Alffd
3fbc81cea7 Ports Enforcer handgun, rubber bullets, and new ammoboxes. 2017-01-15 21:13:22 -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
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
TullyBurnalot
71b64bbb5a Fixes Gun Renaming
- Renaming guns now only produces 1 input box
2016-11-12 01:32:50 +00: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
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
Fox-McCloud
1f4f4c6cfe Crutch Refactor 2016-08-17 21:45:55 -04:00
Tigercat2000
56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00
Fox McCloud
a8da06536c Merge pull request #4977 from FlattestGuitar/grenade-launchers
Fixes the m90 grenade launcher.
2016-07-10 15:51:08 -04:00
Mieszko Jędrzejczak
593aaee243 :^] 2016-07-10 21:43:56 +02:00