cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 08:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,842 Commits 26 Branches 2 Tags
8ae9bb457ccfeb3745af354af97c34b565f13621
Commit Graph

14538 Commits

Author SHA1 Message Date
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
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
Fox-McCloud
1d869d31c1 avoiding conflicts 2016-11-09 22:42:43 -05:00
Fox-McCloud
fcc20ac6bc BSA Tweaks 2016-11-09 22:36:03 -05:00
TheDZD
5d41e856ec Merge pull request #5871 from Fox-McCloud/paper-item-state 
Fixes Paper's In-hand Icon
 2016-11-09 20:49:22 -05:00
Fox-McCloud
a880f740d2 Fixes Paper's In-hand Icon 2016-11-09 20:38:16 -05:00
KasparoVy
0f1ae264f8 Resolves a runtime with alt icons. 
The runtime occurred when get_icon_state() attempted to handle_alt_icon
on a head, even if if was a stump. Adds sanity to check if it's a stump
or if the organ's destroyed (as how it's handled in update_icons for
mobs) and resolves the runtime and #5863.
 2016-11-09 04:28:51 -05:00
Aurorablade
c0f28fd0aa fix a ref id error 2016-11-09 00:51:54 -05:00
Markolie
34c3e7fb8a Prioritize throttle, better admin right check 2016-11-08 17:08:52 +01:00
Markolie
75176722e7 Add OOC throttling 2016-11-08 17:01:44 +01:00
Fox-McCloud
14e2eb8eb0 consumables 2016-11-08 10:26:29 -05:00
Fox-McCloud
b1b78ec3ee nutrition fix 2016-11-08 06:48:24 -05:00
Fox-McCloud
46887e88d8 fixes 2016-11-08 06:41:48 -05:00
Crazylemon64
6ec712df8c Fixes defib leaving people in deadchat, n2o paralyse time 2016-11-06 21:36:24 -08:00
Fox-McCloud
36e84ccdf7 further structure 2016-11-06 15:02:25 -05:00
Fox-McCloud
61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Fox McCloud
1e47d33d65 Merge pull request #5852 from Markolie/grammarnazi 
PA wording fixes
 2016-11-06 12:04:06 -05:00
Markolie
b77da4511e PA wording fixes 2016-11-06 16:44:54 +01:00
Fox-McCloud
77c6460bfe drinking glass refactor 2016-11-06 02:02:08 -05:00