cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 22:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,903 Commits 28 Branches 2 Tags
46d1fbaee114aea1dffc62433701230cd4c57913
Commit Graph

14567 Commits

Author SHA1 Message Date
Kyep
46d1fbaee1 Fixes new merge conflict from patreon PR 2016-12-02 22:53:08 -08:00
Fox McCloud
cf57887f88 Merge pull request #5914 from KasparoVy/fixes-the-pictures 
Tails/body accessories now render properly in ID card photos, 'HD' Char. Preview Icon
 2016-12-01 10:18:25 -05:00
Fox McCloud
f205f5f040 Merge pull request #5915 from Twinmold93/runtime_fixer_t2 
Spacepod and Some Runtime Fixes
 2016-12-01 10:15:51 -05:00
razekpraxis
f17ce8a4ef Adds SHODAN Fluff 
What it says on the title really.

For captain role only. Styla has confirmed.
 2016-12-01 04:23:35 +00:00
Crazy Lemon
c2d14ec15d Merge pull request #5876 from tigercat2000/patreon 
[s]Patreon Modifications
 2016-11-30 02:11:09 -08:00
Kyep
65761b7ac1 Adds UID support 2016-11-28 22:39:04 -08:00
Kyep
7b20d7561e Merge remote-tracking branch 'ParadiseSS13/master' into jobs_unlock_system 2016-11-28 22:19:27 -08:00
Kyep
3865213358 Crazylemon changes 
- Adds UID
- Removes cats
- Adds .Join
 2016-11-28 22:19:07 -08:00
Crazylemon64
3c9516b1eb And your little gloves too! 2016-11-27 14:33:23 -08:00
Tigercat2000
a6b04622af Add cost = 2 to fur cape and fur coat 2016-11-27 13:59:15 -08:00
Crazylemon64
10e06abd9b Brings the fur equipment in line with other loadout gear 2016-11-27 13:30:50 -08:00
Twinmold
4ab60530ae Err... Should Still be !health 
Apparently it's just so that single sound plays when the pod is out of
health utterly.
 2016-11-26 23:18:04 -06:00
Twinmold
e99996c725 Changes Sound and Message Dup Codes to Procs 
By request of Crazylemon. Doing this also removed the need to have the
check for passengers and pilots from the health checks of the pod, as
they are no longer necessary and unified inside the new procs.
 2016-11-26 23:06:55 -06:00
Tigercat2000
711f7c93aa Added FreeStylaLTs items, OOC tag rounding 
Added FreeStylaLT's donor items, changed OOC tag to make it more round,
fixed FreeStylaLT's donor items by adding them to paradise.dme
 2016-11-26 17:48:48 -08:00
Tigercat2000
8ae9bb457c Merge remote-tracking branch 'upstream/master' into patreon 
# Conflicts:
#	code/__DEFINES/misc.dm
 2016-11-26 16:48:07 -08:00
Crazy Lemon
635335dd5c Merge pull request #5910 from FreeStylaLT/patreoncustom 
[s]Adds a few additional custom items for patreon loadout
 2016-11-26 16:44:21 -08:00
Crazy Lemon
9418fdf204 Merge pull request #5916 from Fox-McCloud/status-fixes 
Fixes Faint and Mickey Finn
 2016-11-26 13:41:44 -08:00
Fox-McCloud
ed3a5252c8 Fixes Faint and Mickey Finn 2016-11-26 16:09:00 -05:00
Twinmold
ada80ec529 Pod Fixes and Some Runtime Fixes 
Fixes sending pod pilots to the void when the pod explodes/is destroyed,
as well as giving them damage warnings, just like passengers get. Also
fixes it so if a guardian traps something, then dies, doesn't runtime.
Lastly, fixes it so there isn't a randomly runtime from opening a
critter crate, as well as cleaning up a little snowflake code, thanks to
Crazylemon.
 2016-11-26 05:37:31 -06:00
KasparoVy
e06218371f Sharper character creation preview images, tails/body accessories now show up in ID photos. 2016-11-25 17:55:57 -05:00
KasparoVy
b3c7e97b02 Merge branch 'sharperpreviewimages' into fixes-the-pictures. 2016-11-25 16:08:01 -05:00
FreeStylaLT
512fe140de Removes the black pete hat - had too much resemblance to an already-existing fluff item 2016-11-24 18:29:24 +02:00
FreeStylaLT
9e0223874e fixed conflict 2016-11-24 16:24:08 +02:00
FreeStylaLT
4108d3610c adds all the new items 2016-11-24 16:04:35 +02:00
Fox McCloud
55fc510c92 Merge pull request #5859 from Markolie/oocthrottle 
[s]Adds OOC throttling
 2016-11-24 07:46:35 -05:00
Fox McCloud
e0e930b63b Merge pull request #5781 from Aurorablade/Bugzapper 
Bugzapper
 2016-11-23 16:28:28 -05:00
Fox McCloud
86eac97aa7 Merge pull request #5902 from shazbot194/master 
fix for l6 description and paper hat sprites
 2016-11-23 16:26:07 -05:00
shazbot194
0cd9a555cd Fixing my error 
It apears the code I am using is a little old and didn't have a fix fox
made.
 2016-11-23 02:31:42 -09:00
shazbot194
95f381f0f7 Smaller fix for paper 
turns out I made an error when testing, this is a proper fix for the in
hand item
 2016-11-23 00:31:14 -09:00
shazbot194
00444598d9 fix for l6 description and paper hat sprites 
Changes the description of the L6 from 7.62 to 5.56 so it matches both
its ammo and magizine caliber.
Adds in paper_words sprites to head, and hands so when you have a paper
that is writen on, it can both be seen when holding and when wearing as
a hat.
 2016-11-22 11:16:32 -09:00
KasparoVy
30a8a5feb3 Fixes Disability/Shock Stuttering, Resolves #5899 (#5900) 
* Fixes Stutteing.

The 0 argument was busting this proc because it meant that the current
value of stuttering would be the only one stuttering would ever get set
to through SetStuttering. It didn't even use the 'amount' value.

This fixes it as per the way it used to be
6a7f7394a8 (diff-2de2df982739a4fbdb54a4b2715d6f92L114).
 2016-11-21 21:59:31 -08:00
Crazy Lemon
405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization 
Reagent Reorganization
 2016-11-21 16:54:41 -08:00
Crazy Lemon
f215041315 Merge pull request #5893 from Fox-McCloud/event-cleanup 
Removes Event Procs
 2016-11-21 16:51:16 -08:00
Tigercat2000
198bbbffa2 Add donator loadout category and item defines 2016-11-21 13:52:12 -08:00
Fox-McCloud
9ace0245cf Removes Event Procs 2016-11-16 07:14:08 -05:00
FlattestGuitar
10476052d8 removes the weird thingy 2016-11-15 14:42:56 +01:00
FlattestGuitar
e224919844 Merge branch 'cap-fluff' of https://github.com/FlattestGuitar/Paradise into cap-fluff 2016-11-15 14:41:57 +01:00
TheDZD
220ed7b27b Merge pull request #5872 from Fox-McCloud/bsa 
BSA Tweaks
 2016-11-13 20:27:27 -05:00
TheDZD
9807576359 Merge pull request #5875 from Fox-McCloud/vision-fix 
Fixes Simple Mobs Attacking Pods/Mechs Across Z-Levels
 2016-11-13 19:52:24 -05:00
Mieszko Jędrzejczak
b25e9ca261 floofs 2016-11-14 01:42:30 +01:00
Fox McCloud
497cbad899 Merge pull request #5788 from Markolie/randomfixes 
Fixes
 2016-11-13 19:26:02 -05:00
Crazylemon64
5bf1ad3a18 Vision no longer blinks the blur overlay if your eyes are hurt 2016-11-12 14:14:20 -08:00
TullyBurnalot
71b64bbb5a Fixes Gun Renaming 
- Renaming guns now only produces 1 input box
 2016-11-12 01:32:50 +00:00
Tigercat2000
122178591a OOPS FORGOT THE DEBUG MESSAGES WEW 2016-11-11 08:43:26 -08:00
Tigercat2000
e997207d1f Patreon Modifications 
- Adds a `donators` table for our patreon supporters.
   - Intended to be half-automated, half-manual, in order to correlate
     patreon accounts to ckeys. Uses the `active` field so that supporters
     don't have to have their ckey associated every time they stop and
     restart their donations.
 - Current actions:
   - Donators at tier 1 or greater get a palm tree next to their name in OOC
     (toggleable)
   - Donators at tier 1 or greater get +5 loadout points.
     - Known issue: Loadout points will not update if the table is
       modified during a round where the user has already logged in, due
       to preference datum caching. There's not really any good way to fix
       this, unfortunately.
 2016-11-11 08:29:15 -08:00
Fox-McCloud
55ffd16db8 Fixes Telekinetic Simple Mobs 2016-11-11 10:39:50 -05:00
Fox-McCloud
feecce9d2e OOP blacklist 2016-11-10 21:59:19 -05:00
Markolie
0db6c7cb19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into randomfixes 
# Conflicts:
#	code/game/machinery/cryo.dm
 2016-11-10 17:56:14 +01:00
Fox-McCloud
954e7b3c5d more cleanup 2016-11-10 06:28:28 -05:00
Fox-McCloud
d809645f18 proc fix 2016-11-09 22:44:15 -05:00