Commit Graph

836 Commits

Author SHA1 Message Date
Aurorablade
69ab788689 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-05-18 00:19:32 -04:00
Fox McCloud
224b18af1c Merge remote-tracking branch 'upstream/master' into attack-animation-improvements 2018-05-17 23:34:01 -04:00
tigercat2000
85a19c9935 Merge remote-tracking branch 'upstream/master' into face_lock
# Conflicts:
#	code/modules/mob/mob.dm
2018-05-17 20:21:39 -07:00
Fox McCloud
c0d5655f4d Further Improves Attack Animations 2018-05-17 19:48:03 -04:00
Aurorablade
820550d866 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-04-26 21:49:55 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
df26483e67 Fix runtime logs & Remove a bunch of painful admin notifications 2018-04-25 16:35:02 -07:00
Fox McCloud
eafd57487c Merge remote-tracking branch 'upstream/master' into component-port
# Conflicts:
#	paradise.dme
2018-04-23 13:54:50 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
tigercat2000
caccc13e82 Directional Locking
This adds the ability to lock your mob towards facing either a certain
direction or a certain atom. Direction is done by shift-middleclick,
atom is done by shift-ctrl-middleclick.
2018-04-19 19:01:29 -08:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Aurorablade
c9f935a792 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-04-17 22:30:48 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Aurorablade
f691e08deb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-03-25 23:15:37 -04:00
uraniummeltdown
b09e3ae6f6 spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos 2018-03-05 02:07:31 +05:00
uraniummeltdown
ba4571ae7f removes setting LAssailant
fixed incorrect windoor cable number
gave titanium airlocks max_integrity
2018-03-04 13:52:57 +05:00
uraniummeltdown
a2038d40b3 makes door code more OOP: reduced copypasta in shutter and poddoor code, they have their own icon files, changed name of icon_states in the maps
added a few defines and helpers
do_after family supports callbacks
added airlock security levels to airlocks
obj_integrity for doors, door assemblies, firelock frames
vault door assembly is 8 plasteel up from 6
explosion_block works better
heavy firelocks block explosions, firelock (de)construction uses crowbar instead of welder
xenos can open airlocks
minor change to attacking obj message
2018-03-04 13:52:55 +05:00
uraniummeltdown
8f26d5b8b6 rename __DEFINES/mob.dm to __DEFINES/mobs.dm
make environment_smash into bitflags
add obj_damage for simple animals
make default max_integrity and obj_integrity INFINITY for non-defined objects, until we can move more objects to obj_integrity/take_damage() system
adds examining objects to roughly check damage
more obj_defense.dm procs
tables can be attacked with items, glass tables have a narsie_act()
fixes, changes to make it compile
2018-03-04 13:52:55 +05:00
uraniummeltdown
946ae0d58d moves var/list/armor to /obj level
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05:00
uraniummeltdown
b76f8d2c35 new attack procs
minor fixes to make it compile
cleans up the code
2018-03-04 13:52:54 +05:00
uraniummeltdown
d6a277a224 fix incorrect match path
can butcher with any sharp item on harm intent
simple_animal/attacked_by()
moved var/foldable to box level
some fixes with attack code
updated slime code, can now mousedrop as a slime to feed on mobs
adds sound to simple_animal/attackby
2018-03-04 13:52:53 +05:00
uraniummeltdown
e6ded64e4a adds /mob/living/proc/attacked_by()
updates attack and defense code
adds missing sounds to some items, code cleanup, lowered volume for some sounds (from /tg/)
hitsound and attack_verb updates, weapons given hitsound on New() according to damage type
2018-03-04 13:52:52 +05:00
Aurorablade
8a8fb48a92 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-02-15 23:58:11 -05:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00
uraniummeltdown
9c90c817b6 adds missing lavastaff and guardian phase effect icons
kills off anim() proc, removes ninja rigsuit electricity effect
gets rid of the flick() in temporary_visual.dm because pooling is dead
updates ethereal_jaunt.dm and makes it OOP, wraiths no longer show the wizard animation, jaunters cannot move after duration is over, fixes directions errors
turns many anim() into obj/effect/overlay/temp
smoother pet heart animation
2018-01-18 12:56:18 +05:00
tigercat2000
48d78b4648 Merge pull request #7832 from Fox-McCloud/lungsss
Breathing is Now Handled on Lungs
2017-12-01 17:51:19 -08:00
Kyep
e5db535056 Tiger requests 2017-11-26 12:28:47 -08:00
Fox-McCloud
6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss
# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm
2017-11-18 18:49:47 -05:00
Aurorablade
0f9ac2a291 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-11-01 19:04:17 -04:00
Kyep
a53960989a Tweaks/Improves ERT borgs 2017-10-26 02:45:35 -07:00
tigercat2000
5e7a9a6470 Merge pull request #7904 from FlattestGuitar/guardian-memes
Holoparasites. Take two.
2017-10-15 14:48:20 -07:00
Aurorablade
7558abc0bb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-08-17 19:28:48 -04:00
Fox-McCloud
4479185d6e Merge remote-tracking branch 'upstream/master' into lungsss 2017-08-16 19:20:19 -04:00
Crazylemon64
9b780a6b5b Admins can now set a var to allow a mob to spam-attack 2017-08-05 07:25:52 -07:00
Aurorablade
84e1fce8b6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-07-31 17:12:21 -04:00
FlattestGuitar
9f755e7b70 Adds /tg/ guardians 2017-07-29 18:48:40 +02:00
Fox-McCloud
e9e1f2de8e remove that button! 2017-07-19 12:20:36 -04:00
Fox-McCloud
77375fc1c4 Breathing is Now Handled on Lungs 2017-07-19 03:28:21 -04: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
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Crazy Lemon
4b0d5c9a17 Merge pull request #7674 from Citinited/liquid-dispenser-hotkeys
Hotkeys for liquid dispensers!
2017-07-04 11:15:15 -07:00
Fox-McCloud
bf7b43ded5 Merge remote-tracking branch 'upstream/master' into embedding 2017-07-01 01:03:04 -04:00
Citinited
c9e561fde2 AIs and cyborgs now have hotkeys to more easily activate liquid dispensers
Ctrl-click = toggle on
Alt-click = dispense liquid if on
2017-06-30 04:12:24 +01:00
Aurorablade
d360500a2e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-06-28 22:11:17 -04:00
Fox-McCloud
585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
Crazy Lemon
2679b234e6 Merge pull request #7159 from FlattestGuitar/soul-stone-electric-boooogllgsdglgl
Makes Chaplain soulstones opt-in 👻
2017-06-27 12:57:12 -07:00
Aurorablade
937aa50113 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2017-06-23 04:36:01 -04:00
Crazylemon64
1a06d47a02 Fawkes 2017-06-22 23:25:00 -07:00