cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,080 Commits 26 Branches 2 Tags
68ff13fe3acc306bb3ce6dce6b291799b928fa07
Commit Graph

17098 Commits

Author SHA1 Message Date
tigercat2000
b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks 
[READY] Attack Code Update
 2018-03-22 11:55:53 -07:00
Mars
8be770ed5d Icon is named pill, not pills 2018-03-20 18:19:45 +01:00
Fox McCloud
53bb5eaf35 Vulp Hunger Hotfix 2018-03-19 19:37:35 -04:00
tigercat2000
50f9d695a5 Merge pull request #8124 from Aurorablade/Dreams 
Byond the wall of sleep
 2018-03-19 13:42:00 -07:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium 
Nanocalcium: Bone repair drug.
 2018-03-19 13:37:20 -07:00
tigercat2000
6f5a666b1a Merge pull request #8284 from Aurorablade/CultPassBug 
Cult pass split: Bugs and runes
 2018-03-19 13:28:36 -07:00
shazbot194
0a9a3c2b2b More icons for the M90 (#8738) 2018-03-19 13:20:31 -07:00
tigercat2000
de46e81793 Merge pull request #8775 from Birdtalon/take 
Re-adds "Take" shortcut into admin help
 2018-03-19 11:29:09 -07:00
tigercat2000
cd6b8dfe45 Merge pull request #8566 from Aurorablade/BuffsVulpkanin 
Tips the Scales
 2018-03-19 11:27:35 -07:00
Birdtalon
f7d96d8cfe re-adds take shortcut into adminhelp 2018-03-19 11:27:21 +00:00
Aurorablade
2e74bcd4d5 Why this no commit? 2018-03-19 02:05:37 -04:00
Aurorablade
6aec682631 Diona needing water revert 
Still have hair.
 2018-03-19 02:05:16 -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
Aurorablade
59cbd79cc3 Fine, no typo 2018-03-13 22:31:27 -04:00
Aurorablade
2a3dd305a9 Obscure Admin Related fixes 2018-03-13 22:22:51 -04:00
tigercat2000
4a01ed097d Merge pull request #8750 from PigeonLord/food 
I changed the taste description of a few food items
 2018-03-13 04:56:42 -07:00
Terilia
28806f8fd5 Merge remote-tracking branch 'upstream/master' into terifluff 2018-03-13 05:20:20 +00:00
Terilia
ae88de8669 Trying to solve the merge conflicts. 2018-03-13 04:50:25 +00:00
Fox McCloud
96fc4aba1c Merge pull request #8671 from Aurorablade/PodFluff 
Fluff Item: Decemviri
 2018-03-12 15:58:39 -04:00
Piccione
06fa27ac28 I changed the taste description of a few food items 2018-03-10 21:48:55 +01:00
tigercat2000
fce0f75eb1 Merge pull request #8741 from shazbot194/Desolate_Fluff 
Desolate's fluff name fix, no longer dancing fluff item
 2018-03-07 22:47:49 -08:00
shazbot194
413118d1b4 Removes the dance machine 2018-03-07 15:30:40 -09:00
Tad Hardesty
1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08:00
shazbot194
79539cc0ea Name and Description change 
I forgot to ask Desolate what he wants, here is the fix for that
 2018-03-06 22:18:17 -09:00
shazbot194
cc5d9bc31e Adds in Desolate's dance machine button 2018-03-06 22:10:12 -09:00
tigercat2000
add4852d3c Remove purple rose properly 2018-03-06 04:46:17 -08:00
Regen
ff68c12b31 Removes purple hair flower pin 
Removes the purple hair flower pin, as this is my fluff item.

@Tigercat2000 is moving the sprite to the correct folder then he's available.

:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
 2018-03-06 01:36:10 +01:00
Funce
27d3ccbe10 Allow silicons to properly use interface lock UI. 2018-03-05 11:48:40 +13: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
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
a7d027cef6 mrowl 2018-03-03 23:39:35 -05:00
Fox McCloud
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
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee 
Coffee Mugs and Vendor Change
 2018-03-03 10:32:54 -08:00
FalseIncarnate
3b37c1c48c datum path rename 2018-03-03 13:19:58 -05:00
tigercat2000
2887c4a62f Merge pull request #8710 from Birdtalon/pschye-toys 
A few more things for the Psyche locker.
 2018-03-03 09:59:40 -08:00
tigercat2000
65f0895b64 Merge pull request #8693 from Aurorablade/NecaWTF 
Why Neca
 2018-03-03 09:59:22 -08:00
tigercat2000
d92616c948 Merge pull request #8660 from Tayyyyyyy/ai_status 
Port tg AI status panel
 2018-03-03 09:59:06 -08:00
tigercat2000
aca2769324 Merge pull request #8681 from DarkPyrolord/BluespaceSlices 
Fixes bluespace bread (and other slice foods as well)
 2018-03-03 09:30:23 -08:00
tigercat2000
087457fa9b Merge pull request #8675 from Serkket/001 
Bug-B-Gone
 2018-03-03 09:28:12 -08:00
Citinited
8d559ab9b3 fixes posibrains going to nullspace after losing at russian roulette 2018-03-02 21:44:58 +00: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
FalseIncarnate
060117f5c3 novelty datums 2018-02-28 22:13:38 -05:00
Birdtalon
7283431211 descriptions updated by request 2018-02-27 15:13:41 +00:00