cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,798 Commits 29 Branches 2 Tags
ec4add0ebfa3a02003fc6abfb801a88dfdca56e8
Commit Graph

14993 Commits

Author SHA1 Message Date
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
Kyep
d5e3e14dc9 Requested changes 
- Creates "has_organic_damage" proc and updates cryopod and medibot to
use it.
- For non-human mobs, this proc returns 1 for damaged mobs and 0 for
full-health mobs.
- For human mobs, this proc returns 1 for mobs with damage to organic
parts, and 0 for mobs that are either full health, or have only got
damage to robotic limbs.
 2016-12-05 14:21:32 -08:00
Fox-McCloud
7a55ec18fc Merge remote-tracking branch 'upstream/master' into food-rework 2016-12-05 12:40:32 -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
Kyep
945225b6e8 Runtime & bug fixes 
- Fixes a runtime in preferences.dm created by the Patreon PRs,
triggered when an ERT, SIT, or any other clientless mob uses
"var/datum/preferences/A = new()".
- Fixes a bug where, if a SIT is spawned with the 'choose manually'
option, one fewer person than intended is pulled in.
- Fixes syndicate headset not being included in the SIT member's notes.
- Deletes commented code.
 2016-12-03 06:24:47 -08: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
Kyep
46d1fbaee1 Fixes new merge conflict from patreon PR 2016-12-02 22:53:08 -08:00
Aurorablade
2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
Aurorablade
fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -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
Markolie
3437ea0e57 Move karma to own tab 2016-11-30 22:18:16 +01:00
Crazy Lemon
c2d14ec15d Merge pull request #5876 from tigercat2000/patreon 
[s]Patreon Modifications
 2016-11-30 02:11:09 -08:00
KasparoVy
71bf84b4a9 Merge remote-tracking branch 'upstream/master' into glasses_handling_properly 2016-11-29 17:34:10 -05:00
Fox-McCloud
fef4ebe905 remove-unused-food 2016-11-29 13:46:33 -05:00
Fox-McCloud
f53b38da3d nutrition adjustments 2016-11-29 12:01:59 -05:00
Fox-McCloud
ded838ef15 fixes 2016-11-29 10:05:33 -05:00
Fox-McCloud
9805a96fcd HUD 2016-11-29 08:52:33 -05:00
Fox-McCloud
a1b8205fdd food 2016-11-29 08:45:46 -05: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
Fox-McCloud
e134100164 Hunger Rework 2016-11-28 13:17:46 -05: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
Aurorablade
6ac0c309ec copy and paster errrrrrrrr 2016-11-26 01:34:21 -05: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
FalseIncarnate
1913969578 minor styling fixes 2016-11-24 10:39:30 -05: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