cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 14:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,402 Commits 26 Branches 2 Tags
bcd64e99bec166bc358d7a9cab915d6511296aa2
Commit Graph

983 Commits

Author SHA1 Message Date
variableundefined
b5860a7bfc Merge pull request #12016 from SomeSortaSquid/karma-fix 
Karma purchase infinite loop fix
 2019-09-06 19:29:39 -04:00
variableundefined
b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL 
Atmos tech QoL & Disposal pipe tweaks
 2019-08-28 11:14:17 -04:00
variableundefined
74a981d8c2 Merge pull request #11895 from MarsM0nd/no_dance 
Dance machine preference
 2019-08-28 08:46:26 -04:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud
0af85ab71d here we go 2019-08-26 06:07:35 -04:00
Fox McCloud
d0b4c61129 Loadout Updates 2019-08-26 01:36:47 -04:00
Fox McCloud
85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework 
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme
 2019-08-25 16:51:21 -04:00
SomeSortaSquid
f4813a51c7 Update client procs.dm 
I can't explain exactly why, but switch() responsible for choosing karma_purchase() are parts of an infinite loop I couldn't locate.
Return statements break that loop. As far as I can tell, it's not causing any other issues.
 2019-08-16 22:29:06 +02:00
AffectedArc07
bdc4bba6ac Add back parallax SQL changes 2019-08-14 17:53:15 -07:00
tayyyyyyy
760009a0cb Fix style 2019-08-13 16:32:31 -07:00
tayyyyyyy
77731d87d2 Fix setting high parallax setting insane instead 2019-08-13 16:32:31 -07:00
AffectedArc07
cd57a4605e P A R A L L A X 2019-08-13 16:32:31 -07:00
variableundefined
c8e0dee631 Merge pull request #11735 from AffectedArc07/panic-bunker 
Panic Bunker
 2019-08-12 19:34:19 +08:00
Fox McCloud
a15c9fd932 Merge pull request #11865 from Couls/resource_urls 
change preload_rsc value to set right before resources are sent
 2019-08-11 20:04:22 -04:00
Fox McCloud
39c9e9abde Reworks Plasmamen 2019-08-11 18:56:32 -04:00
Couls
6790d65da4 review fix 2019-08-11 16:48:54 -04:00
Fox McCloud
5dc90cfb6e Merge pull request #11885 from TheSardele/pod-pilor-sec-armband 
Allows pod pilots to start with security armbands
 2019-08-11 16:48:04 -04:00
variableundefined
0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
Couls
ba013de89d Merge remote-tracking branch 'upstream/master' into resource_urls 2019-08-04 21:13:42 -04:00
SteelSlayer
4878d60a31 Atmos QoL updates 2019-07-31 00:53:54 -04:00
variableundefined
ab3e2ca1a8 Merge pull request #11732 from farie82/AFK-subsystem 
Adds the AFK auto cryo removal system (preference setting for players)
 2019-07-20 21:28:52 +08:00
Mars
9ec942f1e1 Comment fix 2019-07-19 20:23:07 +02:00
Mars
ecb4c4132f Dance machine preference 
Adds a verb that allows you to switch wheter you hear and dance to the
disco machine or not.
 2019-07-19 19:30:28 +02:00
TheSardele
b58f7b3307 Allows pod pilots to start with security armbands 
Adds Security Pod Pilots to the allowed roles list for the loadout security armband.
 2019-07-18 14:21:10 +02:00
Couls
fbd5509590 update preload_rsc's definition 2019-07-15 21:52:57 -04:00
Couls
d83547caf6 remove pointless +1 and use ceiling again 2019-07-15 20:49:41 -04:00
Couls
4eb2af193d use round instead 2019-07-15 20:47:40 -04:00
Couls
10a2915c59 Include crazy's calculation for number of sigfigs 2019-07-15 20:34:26 -04:00
Couls
9cca74ce66 change preload_rsc value to set before resources are sent and not after 2019-07-15 17:37:01 -04:00
Couls
192949375a Fix preferences not saving 2019-07-15 05:16:19 -04:00
tayyyyyyy
57c700a814 Sanitize all inputs 2019-07-14 09:35:12 -07:00
farie82
4cfe0c8152 Merge branch 'master' into AFK-subsystem 2019-07-12 16:42:02 +02:00
Couls
7b102e2f4d Remove unused winsets 2019-07-11 01:01:22 -04:00
Couls
4a832c4f61 Fix testmerge issues 2019-07-08 11:20:25 -04:00
Couls
cee64d5c37 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-08 10:13:15 -04:00
variableundefined
58a5ec105a Merge pull request #11608 from Markolie/ghostpda 
Re-adds ghost PDA messages
 2019-07-08 20:22:42 +08:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
AffectedArc07
9bd54a2267 Update client procs.dm 2019-06-23 11:33:08 +01:00
AffectedArc07
afef712773 Auto bunker 2019-06-22 09:58:18 +01:00
AffectedArc07
fec44e72a9 Panic Bunker 2019-06-21 16:23:21 +01:00
joep van der velden
a40ba70cd0 Added the preference option + smoll fix 2019-06-16 21:28:10 +02:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
datlo
4c95169977 Fix an antag rolling exploit 2019-06-01 23:13:13 +01:00
Crazy Lemon
8502c44df6 Merge pull request #11359 from Kyep/ipintel 
Adds XKeyScore (from TG), forum link, removes old discord link
 2019-05-30 19:57:18 -07:00
Kyep
cbfe1ce906 Message before disconnecting 2019-05-30 18:06:10 -07:00
Kyep
eaeea7ce2f adds forum link, removes boxen discord table 2019-05-29 14:56:28 -07:00
Kyep
3662b90265 fix, 'more info' for admins, better whitelist support, pre-client bans 2019-05-28 11:35:53 -07:00
Mark van Alphen
8362a5b056 Re-add ghost PDA messages 2019-05-27 20:50:42 +02:00
Couls
fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00