cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,396 Commits 26 Branches 2 Tags
e8a04e55242fd45a463df8a16f511b5fa1025ef4
Commit Graph

7371 Commits

Author SHA1 Message Date
Crazylemon64
9eb59bd590 Squishy cough 2017-02-15 02:00:51 -08:00
Crazylemon64
36762c70f5 Ruins immersion 2017-02-14 23:51:54 -08:00
Crazy Lemon
4366ba550e Merge pull request #6300 from Alexshreds/disease_effects 
Adds Cough and Sneeze Sounds
 2017-02-14 23:38:23 -08:00
Crazy Lemon
77a98d9a21 Merge pull request #6408 from KasparoVy/Fixing-VoxTailBug 
Fixes Vox-tail Bug
 2017-02-14 23:24:49 -08:00
Crazy Lemon
dd4a64ea6a Uses evil memetainer powers 
Pre-emptively prevents empty list runtimes
 2017-02-14 22:49:41 -08:00
Crazy Lemon
96afaca62c Merge pull request #6293 from KasparoVy/deadchat-anon-pref 
Makes Deadchat Anonymity Persistent as a Preference
 2017-02-14 20:54:27 -08:00
KasparoVy
87aa937d8d Fixes a bug w/ frankenstein limbs and Excises mob icobase/deform so the organs handle it. 
Fixes a bug w/ the first commit where frankenstein limbs got converted to the owner's appearance (icobase/deform) if the owner HAS_ICON_SKIN_TONE.
 2017-02-14 21:39:40 -05:00
Crazy Lemon
ebe28b3372 Merge pull request #6425 from Markolie/stackprogressbars 
Progress bars now stack vertically
 2017-02-14 13:27:47 -08:00
Crazy Lemon
1e84d34559 Merge pull request #6351 from tigercat2000/goonchat_administrator_tools 
Goonchat Admin Filters
 2017-02-14 13:09:24 -08:00
KasparoVy
46158e7854 conflict resolution 2017-02-13 06:35:17 -05:00
Fox McCloud
90f034b470 Merge pull request #6097 from Kyep/terrorspiders-PR2 
Terror Spiders - Part 2
 2017-02-13 06:27:32 -05:00
Fox McCloud
300751373d Merge pull request #6280 from fludd12/Grey-Wingdings 
Wingdings Revival^2
 2017-02-13 06:26:56 -05:00
Kyep
f8647a2108 Crazylemon spacing changes 2017-02-12 19:52:37 -08:00
Markolie
d0247fff2c Progress bars now stack vertically. Also adds a bunch of lazy list helpers. 2017-02-12 23:51:50 +01:00
KasparoVy
6b50f16a12 Fixes Vox-tail Bug 
When a new Vox spawns in, your tail won't suddenly break (become a
different colour).
Abstracts icobase/deform/tail from the species definitions a bit so
individual mobs can have a different icobase/deform/tail than other mobs
of the same species.
 2017-02-12 02:28:15 -05:00
Markolie
900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
uraniummeltdown
3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00
Kyep
9f20cb1685 Fixes merge conflict in event_container 2017-02-10 22:07:05 -08:00
Fox McCloud
04f5276047 Merge pull request #6350 from Markolie/lavaland_updates 
Add remaining Lavaland loot, kinetic accelerator refactor
 2017-02-11 00:02:42 -05:00
Crazy Lemon
cef7f35ce3 Merge pull request #6161 from tigercat2000/goonlights 
Goonlights
 2017-02-10 19:21:20 -08:00
Crazy Lemon
17281506d2 Merge pull request #6123 from KasparoVy/vulp-cblind 
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
 2017-02-10 18:27:58 -08:00
Markolie
b0d4f5d92a Various fixes 2017-02-10 18:55:23 +01:00
Markolie
c14b560ee0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-10 18:21:06 +01:00
Markolie
c93a592102 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	code/modules/shuttle/supply.dm
 2017-02-10 18:19:53 +01:00
Markolie
403b512c9b Merge if conditions 2017-02-09 23:29:10 +01:00
Markolie
0824101f0a Sanity checking for faction copy 2017-02-09 18:57:09 +01:00
Markolie
95f750d6f2 Add faction support to pAI's 2017-02-09 18:54:26 +01:00
Markolie
d7f8f68ff8 Fix posibrain whispering while muted 2017-02-08 22:12:59 +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
7039ac7a6f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-08 19:21:57 +01:00
Crazy Lemon
2d77a0ab4d Merge pull request #6357 from Fox-McCloud/var-edit-fixes 
On Varedit Fixes
 2017-02-07 20:01:32 -08:00
Crazy Lemon
7b39b5ae58 Merge pull request #6358 from Fox-McCloud/all-mobs-hard-del 
Makes all Mobs Hard Delete
 2017-02-07 19:35:58 -08:00
Crazy Lemon
1f60fef9ea Merge pull request #6352 from Fox-McCloud/hydro-tray-nymph 
Fix Diona Nymph Crossing Trays--Refactors Diona Feeding
 2017-02-07 19:35:21 -08:00
Crazy Lemon
7561459cb5 Merge pull request #6296 from KasparoVy/steal-storageimp-check 
Traitor Steal Objective now Checks Storage Implants
 2017-02-07 10:05:44 -08:00
Fox-McCloud
e60cc252c6 fix 2017-02-07 10:01:20 -05:00
Fox-McCloud
8ad196da0f Makes all Mobs Hard Delete 2017-02-07 09:42:49 -05:00
Fox McCloud
93df42e792 Merge pull request #6342 from uraniummeltdown/clingmemory 
Changeling Absorb Memory Fix
 2017-02-07 09:21:32 -05:00
Fox-McCloud
579e3bcbd4 forgot this one 2017-02-07 08:54:39 -05:00
Fox-McCloud
ad2468196e On Varedit Fixes 2017-02-07 08:44:50 -05:00
Fox-McCloud
7d72f348c3 Fix Diona Nymph Crossing Trays--Refactors Diona Feeding 2017-02-06 21:15:19 -05:00
Tigercat2000
c0d3855d53 Goonchat Admin Filters 
This adds Message filters to Goonchat (only for mentors +
administrators).

There is a new option in the settings dropdown of Goonchat to access
these. They are temporary, non-destructive filters which will hide all
messages matching them that are already in your chat, as well as any new
messages matching them.

There are 5 filters currently:
 - Admin; Filters out most admin logs.
 - Combat; Filters out a limited subset of combat messages-
 Specifically, any message with the 'combat' span class. Currently, this
 has only been added to the central /attack and /attacked_by procs, so a
 large considerable amount of hostile actions taken against a
 player are still not going to be filtered out. We can work on adding
 the identifier to more stuff later.
 - Radios: Filters out all radio messages.
 - Speech: Filters out all mob speech.
 - OOC: Filters out OOC chat.

There is also an "All" option, which just turns off all messages that
are not internal to Goonchat.
 2017-02-06 12:19:33 -08:00
Markolie
5deafdb4e5 Fix Destroy() return, replace set_dir with setDir 2017-02-06 20:44:12 +01:00
Markolie
1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates 
# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2017-02-06 20:37:03 +01:00
Markolie
7bdc9a4ca7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2017-02-06 18:54:04 +01:00
Crazy Lemon
e4e99039ea Merge pull request #6321 from uraniummeltdown/aidead 
AI Sprites, Vox clothing sprites, click AI display as AI to interact with it
 2017-02-06 07:13:05 -08:00
Fox McCloud
fb926cb0d4 Merge pull request #6328 from uraniummeltdown/linglink 
Hivemind Link
 2017-02-06 07:26:20 -05:00
Crazy Lemon
4a1cbc1536 Merge pull request #6344 from Fox-McCloud/hivelord-GC 
Makes Hivelord Cores GC
 2017-02-06 04:12:22 -08:00
Crazy Lemon
32bbf77be6 Merge pull request #6286 from uraniummeltdown/aimech 
AI control beacons for mechs
 2017-02-06 04:04:34 -08:00
Fox-McCloud
bdaf614b9d Makes Hivelord Cores GC 2017-02-06 05:54:32 -05:00
Fox McCloud
39c8c9e2c5 Merge pull request #6323 from Markolie/fixxxxx 
Fix airless plating map issue
 2017-02-06 05:17:31 -05:00