cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,961 Commits 26 Branches 2 Tags
bfe8a12f1ef67dbaac9f10406da57ac73ce6a40a
Commit Graph

15190 Commits

Author SHA1 Message Date
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
Mark van Alphen
367fd7abea Merge pull request #425 from ZomgPonies/master 
Custom Item - Telvayne
 2015-02-25 18:51:36 +01:00
ZomgPonies
e8036a074d Custom Item - Telvayne 2015-02-25 12:46:44 -05:00
Mark van Alphen
ab98e134e1 Merge pull request #423 from ZomgPonies/master 
Emergency GC fix for reagents
 2015-02-25 18:18:07 +01:00
ZomgPonies
739882d6d1 Emergency GC fix for reagents 2015-02-25 12:14:18 -05:00
Mark van Alphen
f15f8fb5ae Merge pull request #422 from ZomgPonies/master 
GC fixes
 2015-02-25 17:49:17 +01:00
ZomgPonies
3e4b4d2b6a Merge pull request #406 from SamCroswell/master 
ERT Rework
 2015-02-25 11:43:07 -05:00
ZomgPonies
710d60abda GC fixes 2015-02-25 10:58:56 -05:00
FalseIncarnate
ea468678b6 Remove unused cooldown check 
Removes the accidental inclusion of an unused flip cooldown check for
monkey emotes.
 2015-02-25 01:30:36 -05:00
FalseIncarnate
60d27e07de Emote Cooldown System 
Introduces the Emote Cooldown System, designed to prevent spamming of
sound-based emotes.

Emotes that respect the cooldown:
- *beep
- *buzz
- *ping
- *squish
- *scream
- *fart
- *chirp
- *law
Emotes that are exempt:
- Everything not listed above

Emotes can be added to the system easily, and all cooldown-incurring
emotes share a single cooldown. This means you have to wait to *scream
after you *fart.

Also adds Tigercat's *squish emote ( #394 ), with sound credit to
DrMinky(Freesound.org). This emote is only usable by Slime People, and
accepts a parameter if you wish to squish at something/someone.

Admins with +VAREDIT can manually disable the use of cooldown emotes for
a specific mob by setting the emote_cd var to 2.
 2015-02-25 01:14:06 -05:00
ZomgPonies
9ca2500cf3 Merge pull request #414 from Markolie/master 
Mapfix, hivemind fix
 2015-02-24 19:48:36 -05:00
Markolie
da05274bf4 Mapfix, hivemind fix 2015-02-25 01:13:53 +01:00
ZomgPonies
80b83105fe Merge pull request #399 from Fox-McCloud/flip 
*flip
 2015-02-24 18:35:23 -05:00
SamCroswell
f004028d2b ERT - Medic Hypospray Fix 
The medic's default hypospray was empty. Whoops.
Should be filled with DD now.
 2015-02-24 14:36:04 -05:00
ZomgPonies
358cdf110d Merge pull request #409 from ParadiseSS13/Markolie-patch-1 
Rename Shuttle.dm to shuttle.dm
 2015-02-24 14:29:26 -05:00
ZomgPonies
367c8ba519 Merge pull request #411 from Markolie/master 
Bug fixes
 2015-02-24 14:29:14 -05: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
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