Commit Graph
954 Commits
Author SHA1 Message Date
Crazy LemonandGitHub 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
Fox McCloudandGitHub ae1128b33d Merge pull request #7787 from imsxz/honk-rifle-self-charge
Makes HONK Rifle selfcharge
2017-07-25 11:46:36 -04:00
shazbot194 2401d28895 New enforcer sprites
adds in new enforcer sprites
2017-07-24 20:56:21 -08:00
imsxzandGitHub 39961ea353 Makes honk rifle charge automatically 2017-07-13 14:22:19 -04:00
AurorabladeandFox McCloud 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 354cc6a987 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-04 17:17:09 -04:00
Fox-McCloud 549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud 05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Fox-McCloud 04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Fox-McCloud e8bbe783c6 arm augments 2017-06-28 17:01:34 -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
Tigercat2000 bbca8405ef -tg- Move Refactor
This commit ports /tg/'s move refactor.

The throwing system has been replaced entirely, removing the necessity
of throw_at_fast and resolving multiple outstanding issues, such as
crossbows being unusable.

Spacedrifting has also been upgraded to function with the new throwing
system. It is now it's own process.

Tickcomp has been killed, and the config values have been adjusted to
more or less match live Paradise.

All mobs now share a common Bump() proc. There are only four mobtypes
which do not, including humans and simple animals. With the exception
of mob types that do not ever want to Bump() or be Bumped(), they should
call the parent proc.

Human movement slowdown has been moderately tweaked in how it stacks effects;
It shouldn't be significantly different from a player perspective.

Mobs will now spread fire if they bump into another mob. I don't want to set
the world on fiiiire, I just want start a flame in your heart~

For player facing changes: Input delay has been reduced by roughly ~50ms for
any direction keys, by advantage of a previously unknown flag on byond verbs
which allow them to operate independently from the tick rate of the server.
You may need to clear your interface.dmf file if you have a custom skin for
this change to function.
2017-05-25 06:35:01 -07:00
Crazylemon64 4936a18e70 Merge branch 'master' into remap_centcom 2017-05-20 14:40:03 -07:00
Fox-McCloud 31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Crazylemon64 1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Crazy LemonandGitHub ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells
Damn cells
2017-04-09 13:55:30 -07:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Fox-McCloud 183702a36e fix up 2.0 2017-04-02 00:38:14 -04:00
Fox-McCloud 35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00
Fox-McCloud 182dcd93b5 autolathe receivers 2017-03-24 16:57:25 -04:00
Kyep 39e241bd3a Disconnects Prison, Adds Pulse Turrets 2017-03-12 00:25:18 -08:00
Markolie 3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie 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
Fox McCloudandGitHub cff15468ba Merge pull request #6478 from FlattestGuitar/lasers
New laser carbine icons
2017-02-18 11:07:56 -05:00
Mieszko Jędrzejczak e8a04e5524 Laser carbine icons! 2017-02-17 14:21:48 +01:00
Krausus 4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Markolie 56dd8b189e Proper fix for minebot damage issue 2017-02-15 17:23:57 +01:00
Markolie 519749cf8d Fix OP minebots, move them into a separate file 2017-02-15 16:21:04 +01:00
Markolie 924e539f22 Chassis mods now rename KA, remove cost from chassis mods/tracer mods 2017-02-08 19:27:16 +01:00
Markolie 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
Markolie 053ff0fbbb KA energy adjustments 2017-02-08 03:03:45 +01:00
Markolie 0790ed5f8d KA fixes, upgrade typo fix 2017-02-08 02:45:13 +01:00
Fox-McCloud ad2468196e On Varedit Fixes 2017-02-07 08:44:50 -05:00
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
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 McCloudandGitHub 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 LemonandGitHub 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
Crazy LemonandGitHub 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
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 McCloudandGitHub 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