cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 08:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,080 Commits 17 Branches 2 Tags
68ff13fe3acc306bb3ce6dce6b291799b928fa07
Commit Graph
8099 Commits
Author SHA1 Message Date
tigercat2000andGitHub b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks 
[READY] Attack Code Update
 2018-03-22 11:55:53 -07:00
Fox McCloud 53bb5eaf35 Vulp Hunger Hotfix 2018-03-19 19:37:35 -04:00
tigercat2000andGitHub 50f9d695a5 Merge pull request #8124 from Aurorablade/Dreams 
Byond the wall of sleep
 2018-03-19 13:42:00 -07:00
tigercat2000andGitHub 6f5a666b1a Merge pull request #8284 from Aurorablade/CultPassBug 
Cult pass split: Bugs and runes
 2018-03-19 13:28:36 -07:00
tigercat2000andGitHub cd6b8dfe45 Merge pull request #8566 from Aurorablade/BuffsVulpkanin 
Tips the Scales
 2018-03-19 11:27:35 -07:00
Aurorablade 2e74bcd4d5 Why this no commit? 2018-03-19 02:05:37 -04:00
Aurorablade 737a1575ff NYAH 2018-03-19 01:44:48 -04:00
Aurorablade 13212ee27c Style Tweaks 2018-03-18 23:44:38 -04:00
Tad Hardesty 1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08: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 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 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 a7d027cef6 mrowl 2018-03-03 23:39:35 -05:00
Fox McCloudandGitHub e1003f0d83 Merge pull request #8489 from KasparoVy/eyeglow 
Eyes of Humanoids w/ Great Darkview, XRAY Vision, Synthetic Eyes or Eye Implants Shine in the Dark
 2018-03-03 17:20:52 -05:00
tigercat2000andGitHub d92616c948 Merge pull request #8660 from Tayyyyyyy/ai_status 
Port tg AI status panel
 2018-03-03 09:59:06 -08:00
tigercat2000andGitHub 087457fa9b Merge pull request #8675 from Serkket/001 
Bug-B-Gone
 2018-03-03 09:28:12 -08:00
Citinited c6cc30ff8c Fixes a runtime that can be caused by headless IPCs 2018-03-02 21:39:48 +00:00
Aurorablade 0e558f5b51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BuffsVulpkanin 2018-03-01 19:55:48 -05:00
Aurorablade a3b23f29d6 itMerge branch 'master' of https://github.com/ParadiseSS13/Paradise into CultPassBug 2018-03-01 19:51:05 -05:00
Aurorablade 86f25c5e7f fixes some words... 2018-02-21 23:31:43 -05:00
Aurorablade 63537a050b new hair 2018-02-21 01:36:17 -05:00
Fox McCloudandGitHub e4678d1a9f Merge pull request #8568 from MarcellusPye/SulphAcidNoMore 
Lets grays drink sulphuric acid
 2018-02-20 04:16:11 -05:00
MarcellusPye a426b93a7a Maintainer corrected comments 2018-02-20 19:45:57 +13:00
MarcellusPye 8235d8ec89 Calls parent 2018-02-20 19:38:55 +13:00
tigercat2000andGitHub f73c3c01d8 Merge pull request #8418 from Fox-McCloud/disco-inferno 
Adds Dance Machine
 2018-02-19 22:04:01 -08:00
Fox McCloudandGitHub 0f0f7e13c6 Merge pull request #8444 from HugoLuman/whalecough 
Adds coughing and sneezing sounds for Drask
 2018-02-20 00:48:09 -05:00
Crazy LemonandGitHub 8979e2428d Merge pull request #8410 from tigercat2000/client_dir 
Client dir compatibility, part 1
 2018-02-11 16:40:44 -08:00
Serket 00d501c7df BugBGone 2018-02-10 12:26:30 -07:00
KasparoVy 8ef309eb87 I figured there was a better way to do this. 
Refactors eyecon generation and eye-shine.

Synthetic eyes and cyber-eye implants will now trigger eye-shine.
 2018-02-09 23:52:50 -05:00
KasparoVy 541b4f7275 Readability & Abstraction Improvements + A Tweak 
As per Tigercat's review, readability has been improved and the method
by which eyeshine is applied has been abstracted a lot more.

As part of that, I have divised a solution for the situation where,
prior to this tweak, if you were a Tajara and had the 'bangs' hairstyle
while also having eyeshine, one of your eyes would render ABOVE your
hair.

Now, despite the eye shine happening on a higher layer, the eye that
would ordinarily be hidden by the hair still is.
How? By cutting the pixels that are overlapped by the hair from the eye
icon during rendering.
 2018-02-09 20:12:31 -05:00
KasparoVy 64ced9f6b6 Shiny, not Glowy 
Terminology tweak.
 2018-02-09 20:12:31 -05:00
KasparoVy 5053b2aa74 Adds "Eye-Glow" for Humanoids w/ High Darksight or XRAY Vision 2018-02-09 20:12:30 -05:00
Aurorablade 20ddaccb9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DisMemberments 2018-02-08 02:31:44 -05:00
Aurorablade 1f59e61bc9 I got to test this in a sec... 2018-02-08 02:31:30 -05:00
Tayyyyyyy 27bc58d2cd Fix conditional per tiger 2018-02-08 00:15:02 -06:00
Tayyyyyyy fc19ffe44e Port tg AI status panel 2018-02-07 23:47:12 -06:00
Aurorablade 2921d35037 fixed it. 2018-02-04 21:19:22 -05:00
Aurorablade ddfde7c6fd urgh still not working 2018-02-04 21:01:21 -05:00
Aurorablade 235deac64a medhud fixes 2018-02-04 20:17:09 -05:00
Aurorablade db6ea6ddc0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into CultPassBug 2018-02-02 03:28:30 -05:00
Aurorablade 2980b37eba removes debug line 2018-02-02 01:48:51 -05:00
Aurorablade 061cbcfaf2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MOREDOTS 2018-02-02 01:26:12 -05:00
Aurorablade cbc446a479 it works tiger pants 2018-02-02 00:31:19 -05:00
tigercat2000andGitHub ebe366fd67 Merge pull request #8403 from Aurorablade/FollowThePath 
Ports some hud updates from TG
 2018-02-01 19:56:51 -08:00
Aurorablade 8e3b031e79 tigers suggestion 2018-02-01 18:23:11 -05:00
tigercat2000andGitHub 0da85e6bb3 Merge pull request #8433 from Tayyyyyyy/maint_drones 
Players job banned from syndicate can no longer play emagged drones
 2018-02-01 08:19:50 -08:00
tigercat2000andGitHub d8a00048bd Merge pull request #8424 from uraniummeltdown/airlockoverlay 
Airlock Overlays + Tweaks
 2018-02-01 08:19:24 -08:00
Fox McCloud 5c24e7720d Merge remote-tracking branch 'upstream/master' into disco-inferno 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
 2018-01-29 20:56:44 -05:00