cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 02:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,385 Commits 26 Branches 2 Tags
adbd138595eb31dda1f0bfb89bfd442a430203bc
Commit Graph

15254 Commits

Author SHA1 Message Date
Fox McCloud
adbd138595 Merge pull request #6448 from uraniummeltdown/rodform 
Wizard Rod Form
 2017-02-16 11:49:07 -05:00
KasparoVy
fcfd24219c Welding Gasmasks/Goggles now work again. 
Just a missing proc call.
 2017-02-16 04:33:27 -05:00
Fox McCloud
129d1c63f5 Merge pull request #6461 from davipatury/paradise 
Urnaium
 2017-02-16 00:37:13 -05:00
davipatury
cffe34e3f9 Description fix. 2017-02-15 20:04:26 -02:00
davipatury
63a690ca79 Urnaium. 2017-02-15 20:00:12 -02:00
Fox McCloud
9301cdc74d Merge pull request #6456 from Markolie/fixxxxx 
Fix OP minebots, move them into a separate file
 2017-02-15 14:13:58 -05:00
Markolie
56dd8b189e Proper fix for minebot damage issue 2017-02-15 17:23:57 +01:00
Markolie
519749cf8d Fix OP minebots, move them into a separate file 2017-02-15 16:21:04 +01:00
Fox McCloud
078fb75ff5 Merge pull request #6402 from Crazylemon64/phlog_ignite_fix 
Phlog now consistently ignites upon application.
 2017-02-15 08:35:45 -05:00
uraniummeltdown
c661609076 Merge remote-tracking branch 'remotes/upstream/master' into rodform 
# Conflicts:
#	icons/mob/actions.dmi
 2017-02-15 15:56:36 +04:00
Aurorablade
9eb652d7d0 Its one letter 2017-02-15 04:39:36 -05: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
Aurorablade
92c3311b78 Lighting Bugs 2017-02-14 17:02:16 -05:00
Crazy Lemon
de73349f16 Merge pull request #6359 from Fox-McCloud/advanced-camera-fixup 
Advanced Camera Speedup, features, and sound.
 2017-02-14 13:38:34 -08:00
Crazy Lemon
c665d91448 Merge pull request #6409 from Kyep/smite 
Adds Bless & Smite options for prayers
 2017-02-14 13:29:29 -08: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
eaa0316eed Merge pull request #6434 from Kyep/check_antags_ert 
Adds ERT to Check Antagonists
 2017-02-14 13:24:12 -08:00
Crazy Lemon
1f4b684aa0 Merge pull request #6435 from Aurorablade/MagicMushrooms 
Stunts Growth Serum
 2017-02-14 13:21:00 -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
uraniummeltdown
60e61db55f ports rod form wizard spell from tgstation 2017-02-14 21:05:08 +04:00
Kyep
cdf35ce9da fixes merge conflict 2017-02-13 22:27:06 -08:00
Aurorablade
a39a0f92d9 1.5 growht cap 2017-02-13 08:32:36 -05: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
Fox McCloud
5953b527c0 Merge pull request #6398 from tigercat2000/game_pref_fix 
Fix window flashing not saving to SQL & Add error logging to log_client_to_db
 2017-02-13 06:18:20 -05:00
Fox McCloud
69eae328d3 Merge pull request #6386 from uraniummeltdown/nukedeclaration 
Custom War Declaration
 2017-02-13 06:12:31 -05:00
Fox McCloud
5ac10184a4 Merge pull request #6432 from Crazylemon64/kudzu_botany 
Kudzu growth now scales the correct way for quicker growth speed
 2017-02-13 05:44:02 -05:00
Crazy Lemon
00ed6cd1bd Merge pull request #6367 from Markolie/fixxxxx 
Fixes
 2017-02-13 00:09:46 -08:00
Kyep
3aeb37eedb Adds ERT to Check Antagonists 2017-02-12 23:55:48 -08:00
Aurorablade
6aa7905651 Growth Cap 2017-02-13 02:54:46 -05:00
Crazylemon64
24e255a496 Kudzu growth now scales the correct way for quicker growth speed 2017-02-12 20:54:30 -08:00
Kyep
f8647a2108 Crazylemon spacing changes 2017-02-12 19:52:37 -08:00
Tigercat2000
577df3de36 Add debug light source/corner/overlay instance count 2017-02-12 17:30:10 -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
uraniummeltdown
4cb4b6be82 better war dec checks, added custom war declarations from TG 2017-02-12 20:30:17 +04:00
Fox-McCloud
c2c3881755 Merge remote-tracking branch 'upstream/master' into advanced-camera-fixup 2017-02-12 09:44:07 -05:00
Kyep
be1ae665dd Adds JMP link 2017-02-12 01:23:30 -08: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
Kyep
952c64b1f8 Improves singularity failure notice 2017-02-11 23:08:02 -08:00
Kyep
bcc596361c Adds Bless & Smite options for prayers 
This PR adds two new responses admins can give to prayers: BLESS and
SMITE.

Possible BLESSings:
- Teleport to arrivals
- Moderate, instant heal
- Heal Over Time*
- Permanent Regeneration power*
- Super Powers* (regen, nobreath, coldresist)

SMITE options:
- Lightning bolt (~75 burn damage)
- Brain damage* (75 brain damage, human only)
- Fire Death (150 fire damage + hotspot, instant death)
- Honk Tumor* (inserts honk tumor, human only)
- Cluwne* (makes them into a cluwne, like wizard spell, human only)
- Mutagen Cookie*
- Hellwater Cookie*
- Gib

Options mark with * only work on humans. The rest work on simple_mobs
also.
 2017-02-11 20:34:16 -08:00
Crazylemon64
1d61e3501d Phlog now consistently ignites upon application. 2017-02-11 13:48:20 -08:00
Crazylemon64
6718d49af9 Fixes client varedit 2017-02-11 13:40:45 -08:00
Markolie
900653ea0e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx 2017-02-11 20:31:23 +01:00
Tigercat2000
f427d4315f Fix window flashing not saving to SQL & Add error logging to 
log_client_to_db
 2017-02-11 07:15:04 -08:00
uraniummeltdown
3df3688e72 move all crates to crates.dmi 2017-02-11 17:44:20 +04:00