cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,499 Commits 28 Branches 2 Tags
fa27c06d91d658a21d1406ba2a01ed7b3de17ede
Commit Graph

3360 Commits

Author SHA1 Message Date
TheDZD
eb7b4af916 Merge pull request #4730 from Kyep/beefix 
Fixes Bee Briefcase killing traitors regularly
 2016-06-21 15:54:31 -04:00
Kyep
c9240f216e Changed to DZD's suggestion 2016-06-20 22:17:17 -07:00
taukausanake
fd0c0904f9 how the fuck did I miss this? 
How did everyone else miss it? Thanks to Keroman for telling me something was up with the bandolier.
 2016-06-20 09:38:48 -05:00
Kyep
0f96db96ba Changes Bee Briefcase to not be suicide briefcase 
- Traitors attempting to open a bee briefcase without first having
injected it with their blood, will now be stopped from doing so.
Instead, they will get a message telling them how to open it safely.
- Non-traitors can still open the briefcase as normal - resulting in at
least 5 angry bees that will surely kill them.
 2016-06-20 02:07:07 -07:00
monster860
3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
DaveTheHeadcrab
405a0b7d55 Defib Adjustments (#4702) 2016-06-19 07:32:30 -04:00
TheDZD
e7bdf036da Merge pull request #4698 from FreeStylaLT/grammar 
Fixes some grammar mistakes, changes the \red to <span class> formatting
 2016-06-16 15:14:01 -04:00
FreeStylaLT
5f4830f2fb fixed spacing 2016-06-16 22:01:42 +03:00
FreeStylaLT
3b91bec479 fixed some grammar mistakes, changes the \red to <span class> 
:cl:FreeStylaLT
typo: changed its to it's in lockbox description
fix: changed \red to <span> formatting
fix: changed stetchkin's price from 9 TC to 4 TC, suppressor's from 3 TC to 1 TC
 2016-06-16 21:53:33 +03:00
TheDZD
e98417590b Merge pull request #4651 from Fox-McCloud/ring 
Telephone is More...Ring-y
 2016-06-16 11:53:54 -04:00
Fox-McCloud
4c01733bcc phone force 2016-06-16 11:37:15 -04:00
TheDZD
dbffa27bd4 Merge pull request #4667 from Fox-McCloud/toolbox-tweak 
His Grace Tweak
 2016-06-16 10:27:26 -04:00
KasparoVy
86c7e6c04e Secure Briefcase now On-Par with Regular Briefcase. (#4681) 
In terms of carrying capacity, flags, hitsound and attack verbs.
 2016-06-16 05:17:38 -04:00
Fox-McCloud
56020099bc saner 2016-06-16 03:48:16 -04:00
TheDZD
d2b741b1e6 Merge pull request #4643 from Fox-McCloud/latex-glove-balloon 
Adds in Ability to make Latex Gloves Balloons
 2016-06-14 10:17:01 -04:00
Fox-McCloud
ac0d05d6cf His Grace Tweak 2016-06-14 03:42:47 -04:00
Fox-McCloud
64d5eabeac Telephone is More...Ring-y 2016-06-12 13:26:26 -04:00
Fox-McCloud
1b04261259 Adds in Ability to make Latex Gloves Balloons 2016-06-12 03:28:01 -04:00
TheDZD
92ba1ad036 Merge pull request #4621 from Fox-McCloud/hulk-stuffs 
Removes Hulk+Double Energy Sword
 2016-06-11 12:20:55 -04:00
pinatacolada
3566e6bc91 Defib oversights fixes (#4611) 
* Defib oversights fixes

Well, ripping someone's heart out causes them to have a heart attack
right? Well, if you applied a defib to said person before they died from
said heart attack, the heart attack would be stopped, and you would now
have  a heartless living person, spooky right? This prevents that.
Also fixes defibs saying they didn't work when you applied them to
someone with a heart attack, when they in fact did work. And removed a
magic number too.

🆑 pinatacolada
fix: Fixes defibing people without a heart
fix: Fixes defib saying it didn't work stopping a heart attack when they
do
/🆑

* Update defib.dm

* slimespls

* FIXEDIT
 2016-06-11 12:19:45 -04:00
TheDZD
a2f2da09b9 Merge pull request #4608 from Fox-McCloud/remove-mindslave 
Can Deconvert Mindslaves and Vampire Thralls
 2016-06-11 12:11:34 -04:00
TheDZD
d1f017e684 Merge pull request #4595 from FreeStylaLT/HEAD 
Adds Mind Batterer, an AOE Crowd Control Traitor-only device.
 2016-06-11 12:06:59 -04:00
TheDZD
41386dd748 Merge pull request #4551 from Fox-McCloud/chaplain-things 
Ports 3 New Chaplain Weapons
 2016-06-11 11:51:11 -04:00
TheDZD
818179ebc3 Merge pull request #4562 from taukausanake/belts 
More belt overlays
 2016-06-11 11:50:59 -04:00
Fox McCloud
0d627d3213 Merge pull request #4629 from DaveTheHeadcrab/chaplain_stuff 
Prayer Bead Fix
 2016-06-09 23:49:21 -04:00
SamCroswell
3664fe6b7f Quick Fix 2016-06-09 21:52:44 -04:00
Fox McCloud
7f099b4b75 Merge pull request #4625 from Krausus/PoliceTapeBumpFix 
Fixes Tape Moving Mobs Recklessly
 2016-06-09 03:50:46 -04:00
Fox-McCloud
e6801a98e3 fixes and tweaks 2016-06-09 03:19:27 -04:00
Fox-McCloud
9f6dd7485d Merge remote-tracking branch 'upstream/master' into chaplain-things 2016-06-09 01:05:43 -04:00
Krausus
3c7ab29e2e Fixes police tape moving mobs recklessly 2016-06-09 01:01:03 -04:00
SamCroswell
18260bff66 Prayer Beads - Merge Conflict Fix (For real this time) 2016-06-08 23:32:18 -04:00
Fox McCloud
695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again 
Major Gun Refactor
 2016-06-08 22:49:10 -04:00
TheDZD
16f4b61520 Merge pull request #4613 from Fox-McCloud/experimentssss 
Experimentor Duplication Limit
 2016-06-08 11:15:18 -04:00
Fox-McCloud
f74db988e2 Removes Hulk+Double Energy Sword 2016-06-08 02:44:41 -04:00
SamCroswell
509752f678 Spelling Fix 2016-06-07 21:59:35 -04:00
FreeStylaLT
2febf8ae60 Reduced range to not affect off-screen dudes and dudettes 2016-06-07 15:07:10 +03:00
FreeStylaLT
692aa38d4e Changed from orange to oview 2016-06-07 14:46:20 +03:00
Fox-McCloud
bb02bfa284 Experimentor Duplication Limit 2016-06-07 02:25:06 -04:00
TheDZD
a7d0cfd09c Merge pull request #4597 from Fox-McCloud/progress-fixes 
Fixes Construction Progress Bars
 2016-06-06 22:10:25 -04:00
monster860
64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -04:00
Fox-McCloud
eb653a68c8 Can Deconvert Mindslaves 2016-06-06 10:32:57 -04:00
Fox McCloud
cad0d7ba3a Merge pull request #4607 from monster860/rnd_fix 
Fix some origin_tech s
 2016-06-06 07:17:54 -04:00
monster860
14a6a575a9 Fix some origin_tech's 2016-06-06 05:47:10 -04:00
SamCroswell
106743163e Prayer Beads - Fixes 
The wait time is now appropriate.
Ensures you can only do one prayer at a time.
Changes messages to reflect if you're praying for yourself.
 2016-06-05 17:31:02 -04:00
SamCroswell
04c7c4f843 Prayer Beads - Adds Item 2016-06-05 17:07:40 -04:00
FreeStylaLT
aa63118f9a Buffed the uses to 5, made the stun 80% of a baton to 140% of a baton. Added additional info on examine/use. 2016-06-05 16:40:36 +03:00
Fox-McCloud
5db40a08c7 Fixes Construction Progress Bars 2016-06-04 23:12:23 -04:00
FreeStylaLT
665dbc04e1 you motherfucker 2016-06-05 00:59:24 +03:00
FreeStylaLT
6b099db7a4 how does tiger see this shit 2016-06-05 00:52:03 +03:00
FreeStylaLT
42ddf3e8c9 Adds Mind Batterer, an AOE Crowd Control Traitor-only device. 2016-06-05 00:14:07 +03:00