cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,310 Commits 26 Branches 2 Tags
e2f7f6f055ee02db492bc56b814785209927ed48
Commit Graph

17180 Commits

Author SHA1 Message Date
Fox McCloud
e2f7f6f055 science radio 2019-08-16 23:58:27 -04:00
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
Fox McCloud
f1899f0050 Merge pull request #11697 from Markolie/tribalhealing 
Add tribal splints, ash walker tweaks and Lavaland tweaks
 2019-08-09 17:22:22 -04:00
Fox McCloud
3bd3e96eaa Merge pull request #11695 from Markolie/ruinsport 
Port over remaining Lavaland ruins
 2019-08-09 17:08:38 -04:00
variableundefined
254e45dabd Merge pull request #11938 from farie82/pinpointer-crash-fix 
Fixes the advanced pinpointer crashing the server
 2019-08-04 22:08:56 +08:00
variableundefined
59767b5807 Merge pull request #11935 from Ty-Omaha/what-the-heck-is-this-even 
Refactors disgusting if statement
 2019-07-30 21:41:02 +08:00
TheSardele
9e5fe62155 Fixes earmuffs not protecting from vampire screeches 
Fixes a bug where earmuffs wouldn't protect you from vampire screeches if you were wearing earmuffs in your right ear slot while wearing something else in your left ear slot.
 2019-07-30 00:36:45 +02:00
joep van der velden
5847c9f5c6 turf instead of the plain Z 2019-07-29 01:04:14 +02:00
joep van der velden
d139c68227 Fixes the advanced pinpointer crashing the server 2019-07-29 00:51:44 +02:00
Ty-Omaha
f019476b3d why??? 2019-07-28 17:53:17 -04:00
Mark van Alphen
88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
farie82
4cfe0c8152 Merge branch 'master' into AFK-subsystem 2019-07-12 16:42:02 +02:00
variableundefined
96cd20430b Merge pull request #11687 from Kyep/you_have_time 
Public Time & Security
 2019-07-12 18:20:34 +08:00
variableundefined
52ae3bb933 Merge pull request #11674 from DoctorDrugs/Additional-Miners 
Adds additional roundstart miner slots
 2019-07-12 18:16:32 +08:00
variableundefined
36736277a1 Merge pull request #11358 from Couls/diagonal-movement 
[Ready for Testmerge] Implement Diagonal Movement
 2019-07-12 17:12:57 +08:00
Couls
147f740c49 Improve diagonal pulling 2019-07-11 14:56:48 -04:00
Couls
197192789e Derp 2019-07-09 18:59:23 -04:00
Couls
f6f61bf91b grammar 2019-07-09 18:53:05 -04:00
Couls
7c98437892 send message to the right person 2019-07-09 18:09:21 -04:00
Couls
880bddecb6 Add a notice as to why monkeys don't give blood 2019-07-09 17:57:12 -04:00
Couls
3caa97e4f9 add comments for future contributors 2019-07-09 17:48:23 -04:00
Couls
217d0503f7 Can suck humanized monkeys again 2019-07-09 17:41:23 -04:00
Couls
fc287c49f5 Can now suck people with ckeys again, unhumanized monkeys give blood 2019-07-09 17:40:04 -04:00
Couls
2d7f2bb3c2 Code cleanup, spacing fixes 2019-07-09 08:11:43 -04:00
Couls
e16b495170 More testmerge fixes and improvements 
Shift middle click locks your direction again
Spacepods now move again(literally one letter fixed this)
Holster hotkey is back!(H to holster and unholster)
Hotkey Toggle button has been removed from the bottom bar and verbs
 2019-07-09 07:59:12 -04:00
variableundefined
e42e1af87a Merge pull request #11634 from Markolie/laborstacker 
Updates the prison labor point system
 2019-07-09 18:21:58 +08:00
variableundefined
c89ca19701 Merge pull request #11658 from Markolie/turfspace 
Adds the ability to remove plating
 2019-07-09 18:18:13 +08:00
variableundefined
8dcccf220a Merge pull request #11125 from Quantum-M/editVampireMuzzle 
Vampire edits
 2019-07-09 18:15:42 +08:00
variableundefined
03d86f64eb Merge pull request #11804 from Markolie/fix123 
Water turf runtime fix
 2019-07-09 16:13:22 +08:00
Mark van Alphen
cdb447b89b Water turf runtime fix 2019-07-08 22:03:32 +02:00
Mark van Alphen
d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02: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
742bc62c8b Merge pull request #11544 from Arkatos1/recharger 
Rechargers now show their contents and charge status on examine
 2019-07-08 20:18:36 +08:00
variableundefined
82a52969e2 Merge pull request #11525 from Citinited/rpd-radial-menu 
Adds a mini-radial menu to the RPD
 2019-07-08 17:33:46 +08:00
Couls
a7b4e0b9ef Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-07-07 22:17:19 -04:00
variableundefined
93d9cd4e08 Merge pull request #11787 from JKnutson101/lattice_catwalk_fix 
Fixed a bug that prevented Catwalks and Lattice from returning materials
 2019-07-07 22:10:08 +08:00
variableundefined
c2bd18e4fd Merge pull request #11639 from datlo/antagexploitfix 
Fix an antag rolling exploit
 2019-07-07 20:27:59 +08:00
unknown
8aa5bbdb9c removed unnecessary == TRUE 2019-07-06 14:26:42 -04:00
unknown
25f68f2e41 Removed a line that prevented Catwalks and Lattice from returning materials 2019-07-04 16:17:32 -04:00
Couls
33d35eb625 Merge branch 'master' into diagonal-movement 2019-07-02 05:55:44 -04:00
Couls
411a6ecec7 some more tweaks 2019-07-01 03:04:24 -04:00
unknown
ded7e4be67 fixed a bug where construction permits deleted themselves prematurely 2019-06-30 20:49:37 -04:00
farie82
c5dba26b0e Merge branch 'master' into AFK-subsystem 2019-06-30 15:34:06 +02:00
variableundefined
facb2b344c Merge pull request #11748 from Ty-Omaha/fix 
Fixes Shield Blob Exploit
 2019-06-29 09:23:05 +08:00
variableundefined
87f483c9f6 Merge pull request #11581 from alex-gh/location_hint_fix 
Steal objective and Adv Pinpointer no longer target items in Centcom Z level.
 2019-06-28 21:04:01 +08:00
variableundefined
41904fff2e Merge pull request #11522 from Couls/mechfab 
Fix cybernetics not appearing in mech fabricator
 2019-06-28 21:03:20 +08:00
variableundefined
6f4ef0084d Merge pull request #11715 from improvedname/hop-my-AAA-AAA-AA 
Miner starter kits you can order from cargo will no longer include a ID that grants miner/cargo access, only the concription kits from mining vendor
 2019-06-28 21:02:23 +08:00
variableundefined
7d8dfeb3d3 Merge pull request #11722 from Aurorablade/JustInTimeForsummer 
Adds Hawaiian Shirts
 2019-06-28 21:01:42 +08:00
variableundefined
7a04116a07 Merge pull request #11728 from Citinited/ai-slippers 
Better sprites for liquid dispensers
 2019-06-28 20:59:37 +08:00