Commit Graph

256 Commits

Author SHA1 Message Date
Mark van Alphen ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
2019-05-30 19:35:52 +02:00
Mark van Alphen eac4f841ce Switch to penetrator/sopo rounds only 2019-05-02 01:39:11 +02:00
Mark van Alphen 5216106192 Uplink kit rebalance 2019-05-01 21:35:56 +02:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Fox McCloud 182177f6eb grammar/wording 2019-02-23 18:17:21 -05:00
Fox McCloud bb3f2266cf Adds Compact Sniper Rifle to Uplink 2019-02-17 03:32:10 -05:00
xerdies 2fe8fc3073 Adding new sniper bullets. 2019-02-15 20:35:51 +00:00
xerdies ede4f5d6c8 Updated to boolean. 2019-02-14 21:10:21 +00:00
xerdies 98c3a35174 Initial Commit for the Donksoft sniper. 2019-02-13 21:41:36 +00:00
Aurorablade d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
2019-01-26 02:17:22 -05:00
Aurorablade b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade 4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
AzuleUtama 25ee0ddade Syndie Bundle Rework 2019-01-10 19:23:47 +00:00
AzuleUtama fb052938c8 Cane shotgun darts more effective + other changes 2019-01-05 01:41:39 +00:00
Aurorablade 86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
AzuleUtama 8284c56c54 Fixes bulldog and c20's low ammo alarms only going off once 2018-12-12 00:28:45 +00:00
Granodd 8fb45039c0 moved attackby proc to projectiles/guns/projectile.dm 2018-12-02 21:10:20 -05:00
Granodd 9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
datlo 2c3541b95f Fix a couple of finger gun issues 2018-11-25 19:04:53 +00:00
datlo a80efa4924 Add the advanced mimery kit to mime uplinks
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
2018-11-23 07:23:34 +00:00
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