cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,045 Commits 26 Branches 2 Tags
43783ca5836e2b5bead606344f85d2097f4fdca3
Commit Graph

2164 Commits

Author SHA1 Message Date
ZomgPonies
43783ca583 Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance 
RnD Fixes and Tweaks
 2015-02-28 22:16:37 -05:00
Mark van Alphen
18692eedfe Merge pull request #450 from ZomgPonies/fixuns 
More fixins and various features
 2015-02-28 17:33:28 +01:00
ZomgPonies
2a18787c50 Merge pull request #447 from Fox-McCloud/Shields 
Telescopic Riot Shield
 2015-02-28 09:07:07 -05:00
Fox-McCloud
87c15c4e3f Merge pull request #441 from SamCroswell/master 
Quick-Equip Hotkey Fix, Pulse Rifle Icon Fix
 2015-02-27 20:07:34 -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
ZomgPonies
f27ccb6f4d Owlman/Griffin toys/posters/barsign 2015-02-27 13:24:45 -05:00
Mark van Alphen
d89c885a14 Merge pull request #435 from ZomgPonies/fixuns 
Various fixings and additions
 2015-02-27 18:22:35 +01: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
ZomgPonies
90c5083ddf Fix for rod inhands. 2015-02-26 17:05:23 -05:00
ZomgPonies
10bef3e8dd Rods now change sprite depending on how much in the stack 2015-02-26 09:21:13 -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
ZomgPonies
859c907962 Merge pull request #396 from Markolie/master 
Bug fixes, bot process update
 2015-02-24 08:01:25 -05:00
Markolie
140e767c01 Add dot to desc 2015-02-24 02:18:46 +01:00
Markolie
3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01: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
004b365110 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm
 2015-02-22 22:15:45 +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
Fox-McCloud
bea78f2432 Chemistry Tweaks 2015-02-22 15:05:15 -05: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
Markolie
3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +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
Fox-McCloud
4b74e209b5 Medical Stacks 2015-02-21 21:34:58 -05: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
Markolie
c89e3ac1eb Revert "Revert "Emergency communications hotfix"" 
This reverts commit 3ea36839a8.
 2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay"" 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-02-20 17:46:35 +01:00