cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-17 21:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,838 Commits 27 Branches 2 Tags
3da7790dd3e89c9cc92f500cacecedc1fa3ddc68
Commit Graph

8289 Commits

Author SHA1 Message Date
Fox-McCloud
91f456e1f1 Merge pull request #73 from SamCroswell/master 
Weapons No Longer Embed, Minor Map Edits
 2014-12-14 16:52:18 -05:00
SamCroswell
47a072742e Removes Snowmobiles, Fixes Ion Inhand 2014-12-14 16:46:42 -05:00
Fox-McCloud
78d161742e Healthdoll 2014-12-14 16:43:06 -05:00
SamCroswell
a82e3d95ee Weapons used at melee range no longer embed. 
Melee weapons will no longer embed when hitting people directly with
them.

Note that items that are thrown and projectiles will still embed as per
their normal behavior.
 2014-12-14 14:00:23 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie
1dda38f659 Larva fix 2014-12-14 03:33:45 +01:00
Markolie
303d7dbf47 Access fixes 2014-12-14 02:00:18 +01:00
Markolie
38e709e4bd Telescience crystal revert, supervisor access/PDA/headset fixes 2014-12-14 00:46:46 +01:00
Markolie
19d6bf8cc4 Armalis armour fix, remove backup from git 2014-12-13 22:03:38 +01:00
Markolie
22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Markolie
320f4ee151 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-13 18:59:25 +01:00
Markolie
6d3f0e8bf4 Bug fixes 2014-12-13 18:59:04 +01:00
Fox-McCloud
8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Markolie
e31886016b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/objects/structures/window.dm
 2014-12-13 02:15:05 +01:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud
e657ee93a8 Merge pull request #66 from TheDZD/Slime-People 
Properly Removes Slime Person Ventcrawl
 2014-12-12 17:46:32 -05:00
Fox-McCloud
fb14d3831e Movement Speed Refactor 2014-12-12 10:17:53 -05:00
Fox-McCloud
1b4cd99491 Merge pull request #64 from Fox-McCloud/Stamina 
Stamina
 2014-12-12 08:19:39 -05:00
Fox-McCloud
e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Fox-McCloud
e7d57174c0 Merge pull request #63 from Markolie/master 
Bug fixes, /tg/ telescience port
 2014-12-12 03:41:03 -05:00
Markolie
c55c74207d Telescience port from /tg/ 2014-12-11 17:10:40 +01:00
Markolie
46a061e722 Bug fixes 2014-12-11 15:20:45 +01:00
DZD
8e1d0855df Properly Removes Slime Person Ventcrawl 
Commit #535 on https://github.com/ZomgPonies/Paradise had not properly
removed the addition of the ventcrawl verb to Slime People, this is
fixed.
 2014-12-10 21:45:05 -05:00
Fox-McCloud
066d5bb991 Merge pull request #57 from Markolie/master 
Bug fixes
 2014-12-10 00:31:12 -05:00
Markolie
b8282b7cae Blueshield/NT Rep/NT Rec updates 2014-12-10 06:09:06 +01:00
Markolie
7359061678 Bug fixes 2014-12-10 04:47:24 +01:00
Fox-McCloud
c1921ad150 PAI Changes 2014-12-09 22:45:05 -05:00
Fox-McCloud
1aff490e42 Magboots Fix 2014-12-09 22:11:18 -05:00
Fox-McCloud
4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
Fox-McCloud
8b59fc7cf1 Merge pull request #51 from Markolie/master 
Advanced Health HUD fix
 2014-12-07 23:44:51 -05:00
Markolie
766831f1ff Advanced Health HUD fix 2014-12-08 02:26:13 +01:00
Fox-McCloud
cd6814e380 Merge pull request #48 from Markolie/master 
Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
 2014-12-06 22:59:38 -05:00
Markolie
b8a440f23a Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes 2014-12-07 04:55:48 +01:00
DZD
0c75432620 Merge remote-tracking branch 'upstream/master' 2014-12-06 13:09:13 -05:00
Fox-McCloud
ce94dbe5e9 Merge pull request #43 from Markolie/master 
HUD fixes, Vox naming change, Beepsky ID fix, IPC fixes
 2014-12-06 03:04:27 -05:00
Fox-McCloud
21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
Markolie
86f80d5a69 IPC fixes galore 2014-12-06 08:28:02 +01:00
DZD
908058c8f0 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2014-12-05 20:32:40 -05:00
Markolie
6c92a48c41 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-06 01:31:31 +01:00
Markolie
aa68b2e160 AI/Cyborg HUD fixes, lets Vox's pick name when spawning, fixes Beepsky's/ED-209's ID'ing issue 2014-12-06 01:26:59 +01:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Fox-McCloud
1a1cc7137d Merge pull request #40 from SamCroswell/master 
Coin Flipping! Also more map fixes.
 2014-12-04 17:16:03 -05:00
SamCroswell
a1959291b7 Coin Flipping! Also more map fixes. 2014-12-04 17:12:41 -05:00
Fox-McCloud
31c6fc986e Merge pull request #38 from Markolie/master 
Adds a "Toggle Sensors" verb to the robot/AI to set their HUD
 2014-12-04 16:45:52 -05:00
Fox-McCloud
3cd97430df Merge pull request #39 from SamCroswell/master 
Minor Map Fixes - New Costume Preset
 2014-12-04 16:26:45 -05:00
Markolie
5b91100303 Adds a "Toggle Sensors" verb to the robot/AI to set their HUD 2014-12-04 22:01:05 +01:00
Markolie
a1a80c1a27 Minor fixes 2014-12-04 18:18:01 +01:00
SamCroswell
32661552e9 You cannot use the force, Luke! 2014-12-03 21:48:42 -05:00
SamCroswell
021bc233be Dualsword Inhand Fix, Adds Dark Lord Costume Preset 2014-12-03 21:47:12 -05:00
Fox-McCloud
72ecf4ba5e Merge pull request #34 from Fox-McCloud/Production-Tweaks 
Production tweaks
 2014-12-03 18:52:09 -05:00