Commit Graph

17074 Commits

Author SHA1 Message Date
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
c2c7505aa0 ERT - PDA colors 2015-02-24 13:47:26 -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
Markolie
b44255d250 Bug fixes 2015-02-24 18:57:12 +01:00
Mark van Alphen
534c178c03 Rename Shuttle.dm to shuttle.dm
Changing name directly in Github so it sticks.
2015-02-24 18:52:03 +01:00
Mark van Alphen
ae04cce220 Merge pull request #397 from ZomgPonies/garbage
vg Garbage Collector
2015-02-24 18:28:45 +01:00
ZomgPonies
ef7fe5a181 Optimizing lobby stuff 2015-02-24 11:22:12 -05:00
SamCroswell
afc12894c8 Response Team - Sechud Fix
Response Team members should now have a secHUD icon once again.
2015-02-24 10:45:13 -05:00
SamCroswell
81f5b43558 ERT Landmark Fix 2015-02-24 10:20:24 -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
544910f449 Rebalance nuke ops skin color a bit 2015-02-24 01:58:23 +01:00
Markolie
3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
Fox-McCloud
4b127dfadd *flip 2015-02-23 18:49:48 -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
ZomgPonies
5c14d9c5f2 vg Garbage Collector 2015-02-23 17:18:38 -05:00
Fox-McCloud
6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
Markolie
aec958af9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-23 21:20:04 +01:00
Markolie
483565c56a Remove default examine from attack_ghost 2015-02-23 20:53:25 +01:00
Mark van Alphen
8457375738 Merge pull request #391 from ZomgPonies/schedule
Goon process scheduler
2015-02-23 19:46:17 +01:00
ZomgPonies
58612b62fe Adding event and bot controllers 2015-02-23 13:38:58 -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
ZomgPonies
3c0d278a91 Scheduler fixes and additions 2015-02-23 10:35:25 -05:00
Fox-McCloud
96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Markolie
8f5bddbb32 Fix compile error 2015-02-22 22:29:58 +01: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
8f88221d42 Add sound to light smashing 2015-02-22 22:25:19 +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
aee4626ed9 Slow down milking Betsy 2015-02-22 21:31:28 +01:00
ZomgPonies
2c50a42ba7 Goon process scheduler 2015-02-22 15:24:46 -05: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
Artorp
772e931706 Mime backpack: Mandatory & added to supply crates 2015-02-22 20:45:26 +01:00
Markolie
0048394e3c Fix pAI universal translator toggle 2015-02-22 19:30:45 +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
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
ZomgPonies
bb620841a1 Merge pull request #375 from Fox-McCloud/Thickmaterial
Thickmaterial
2015-02-22 08:26:02 -05:00
Fox-McCloud
232eaaac72 Revert "Revert "Tail Wagging System""
This reverts commit eb4f2af194.
2015-02-22 04:41:02 -05:00
Fox-McCloud
10c06a71a2 Revert "Revert "Death Wagging""
This reverts commit 1c32a43506.
2015-02-22 04:40:34 -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
6d00d54b86 OpTable mousedrop checks 2015-02-22 05:07:43 +01:00
Artorp
6da4244ccc Gives the mime his very own door
- The door uses the freezer airlock icon
- The door has no sound for open/close
2015-02-22 04:51:04 +01:00
Fox-McCloud
4b74e209b5 Medical Stacks 2015-02-21 21:34:58 -05:00