cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
4623 Commits
Author SHA1 Message Date
ZomgPonies 3fec57ed8f Merge pull request #494 from Fox-McCloud/Cyborg-Balance 
Cyborg Rebalance
 2015-03-04 00:15:15 -05:00
ZomgPonies 463204c913 Merge pull request #493 from Markolie/master 
NanoUI synth airlock control, ERT equipment rework, fixes
 2015-03-03 21:28:22 -05:00
Markolie 4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
Fox-McCloud 253563e211 Energy Tweaks 2015-03-03 16:00:07 -05:00
Markolie a4ab62de58 Fix debraining a severed head 2015-03-03 19:52:10 +01:00
SamCroswell b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
DZD 69eb5509ec Fixes exchange document objective 2015-03-01 20:35:09 -05:00
ZomgPonies 2b917b17cd Merge pull request #475 from Markolie/master 
Bug fixes galore
 2015-03-01 14:41:42 -05:00
Markolie d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
ZomgPonies 5a94b87331 Merge pull request #457 from Fox-McCloud/Cameras 
Camera Update+Camera Bugs
 2015-03-01 12:28:58 -05:00
Fox-McCloud a7f631f364 Health and Stack Fixes 2015-03-01 01:07:14 -05:00
ZomgPonies 43783ca583 Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance 
RnD Fixes and Tweaks
 2015-02-28 22:16:37 -05:00
Fox-McCloud a9285627ac Merge remote-tracking branch 'upstream/master' into Cameras 2015-02-28 16:24:03 -05:00
ZomgPonies 2a18787c50 Merge pull request #447 from Fox-McCloud/Shields 
Telescopic Riot Shield
 2015-02-28 09:07:07 -05:00
Fox-McCloud 62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Fox-McCloud 923ba5932f RnD Fixes and Tweaks 2015-02-27 17:36:20 -05:00
SamCroswell 75b2220e3e Merge Conflic Fix 
Conflicts:
	icons/obj/gun.dmi
 2015-02-27 15:52:26 -05:00
Fox-McCloud 30465b03d6 Telescopic Riot Shield 2015-02-27 07:31:03 -05:00
Fox-McCloud c4950227ca Fixes Watertanks 2015-02-27 01:56:15 -05:00
SamCroswell 5eec718c71 RCD fix 
RCDs now take ammo properly.
 2015-02-26 22:08:12 -05:00
Markolie d118e026fa Re-apply kitchen code 2015-02-25 22:14:14 +01:00
Markolie 8e159c51b3 Ensure extinguisher precision works 2015-02-25 21:33:34 +01:00
Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
 2015-02-25 20:44:32 +01:00
Markolie 6efa3bcdaa Fix trays (now bags) 2015-02-25 20:42:43 +01:00
Markolie 89650e8590 Extinguisher wheelchair update, deathsquad robot fix 2015-02-25 19:56:24 +01:00
Markolie e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
SamCroswell 8807f13305 ERT - Helmets Change, Cells Capacity Adjustment 
The pulse pistol now has 1600 max charge, the Carbine now has a max
charge of 4000.

ERT helmets no longer need to be fastened to their suits to be equipped,
as this was causing bugs.
 2015-02-24 14:25:28 -05:00
SamCroswell c1c6c80eda ERT - Emergency Box, Toolbelt Fix, PDA 
The ERT's emergency box now contains:
- A survival knife
- A breath mask
- A full double-extended emergency oxygen tank
- A pair of night vision goggles.
- An inaprov autoinjector.

ERT engineering toolbelts now contain multitools. Whoops.

Add ERT PDAs, at Mark's request.
 2015-02-24 13:02:15 -05:00
SamCroswell cd7b1a4075 ERT Rework - Part One 2015-02-24 09:47:44 -05:00
Mark van Alphen 1a8c0f43a8 Merge pull request #398 from SamCroswell/master 
Compact Defib - Overlay Fix
 2015-02-24 00:03:11 +01:00
SamCroswell 4a439b67ba Compact Defib - Overlay Fix 
The compact defib units now use the belt overlay, as opposed to the
back-mounted ones.
 2015-02-23 17:53:28 -05:00
Fox-McCloud 6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
ZomgPonies e9288c614b Merge pull request #388 from Markolie/master 
Remove click delay, standardize mutations, attack animations, attackby() params addition
 2015-02-23 12:47:25 -05:00
Fox-McCloud 96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Mark van Alphen 130ed7e18c Merge pull request #381 from Artorp/MimeDoor 
Gives the mime his very own door and ports /tg/ mime backpack
 2015-02-22 22:29:03 +01:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie 377dfe894d Add attack animations 2015-02-22 21:15:54 +01:00
Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
 2015-02-22 19:12:11 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
ZomgPonies 1f5ef8d4dd Merge pull request #380 from Markolie/master 
Adds celsius to the freezer/heater, crafting update
 2015-02-22 08:30:11 -05:00
ZomgPonies 1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits 
Syndi hardsuits
 2015-02-22 08:27:38 -05:00
Artorp 62f5006944 Ports mime backpack from /tg/station 2015-02-22 06:27:36 +01:00
Markolie 6d54e142eb Update ghetto bomb explosion 2015-02-22 05:45:22 +01:00
Markolie efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
ZomgPonies 07cdcb3cff Merge pull request #367 from Markolie/master 
Switch copytext and sanitize proc
 2015-02-20 16:22:32 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Artorp ef2c939872 Change space law iframe wiki link 2015-02-20 19:20:21 +01:00
Fox-McCloud be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -05:00
DZD a299793ab8 Makes code compile again 
Fixing merge conflicts had the sideffect of adding one instance of
canremove, and one of drop_from_inventory.
 2015-02-18 13:50:36 -05:00