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
30,973 Commits 26 Branches 2 Tags
0bb62ebb367e3262d3e080618f68cb39badfb4be
Commit Graph

14595 Commits

Author SHA1 Message Date
Aurorablade
0bb62ebb36 everything works thanks to our tiger overlords.. 2016-12-12 23:59:37 -05:00
Aurorablade
c5e6c9323b addresses mrrowl comments 
still haveing shuttle load issues after first one is loaded..
 2016-12-11 23:11:21 -05:00
Aurorablade
2285f40a88 ...okay soe ikea shuttles are back on new template loads 2016-12-09 22:23:12 -05:00
Aurorablade
19925a3313 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-06 21:22:16 -05:00
Mieszko Jędrzejczak
ddb1e83d1d Adds floof 2016-12-06 11:42:10 +01:00
Aurorablade
a53a716bd2 ....Well i fixed IKEA shuttles anyway.... 
now just to fix docking templates without force docking it.
 2016-12-05 22:07:54 -05:00
Fox McCloud
029133a9ad Merge pull request #5945 from Markolie/aieye 
[s]Fix AI static exploit
 2016-12-04 16:02:50 -05:00
Markolie
8b2933b0a1 Fix AI static exploit 2016-12-04 20:03:17 +01:00
Crazy Lemon
51822ab940 Revert "Revert "Makes the admin logout tracking system actually work"" 2016-12-03 02:23:18 -08:00
Crazy Lemon
c8f54b4d53 Revert "Makes the admin logout tracking system actually work" 2016-12-03 01:53:47 -08:00
Crazy Lemon
6a06a9862f Merge pull request #5895 from Kyep/erpwarningfix 
ERP Warning Fix
 2016-12-03 00:40:53 -08:00
Crazy Lemon
5b9375e312 Merge pull request #5917 from Crazylemon64/admin_logout_notify_fix 
Makes the admin logout tracking system actually work
 2016-12-03 00:40:09 -08:00
Aurorablade
2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05: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
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
Crazylemon64
9ba6f131ca Adds 2 other spots to notify the main chat 2016-11-27 12:48:21 -08:00
Crazylemon64
8271a89dab Makes the admin logout tracking system actually work 2016-11-27 12:00:57 -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
Kyep
9dea03beb4 ERP Warning Fix 2016-11-19 14:46:13 -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