cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 23:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,771 Commits 26 Branches 2 Tags
e6a71ce5809ea69b162b4fa4ddca039669901103
Commit Graph

7572 Commits

Author SHA1 Message Date
Fox McCloud
e6a71ce580 Merge pull request #7135 from IK3I/Don't-Let-Your-Memes-Be-Dreams 
Fixes #7124 and Adds more Xenomorph emotes
 2017-04-22 23:53:56 -04:00
IK3I
66b3b8bafb Kills the dream 
Also makes noise emitting emotes actually use the sounds they're
associated with and adds a cd to the sound emitting emotes.
 2017-04-21 15:59:59 -05:00
Crazy Lemon
fc1e84f042 Merge branch 'master' into make_paradise_great_again 2017-04-21 11:32:47 -07:00
Crazy Lemon
327f89c890 Merge pull request #6950 from Fox-McCloud/tesla-tweaks 
Tesla Update
 2017-04-21 09:52:23 -07:00
IK3I
55e9de4954 Fixes an oversight for potential abuse 2017-04-20 21:04:11 -05:00
IK3I
9f7245fdf1 Fixes an oversight for potential abuse 2017-04-20 18:53:55 -05:00
IK3I
bd4458bc86 Fixes #7124 and improves on it 
Adds an emote CD for flipping
Adds a new emote for all the flips!
 2017-04-20 18:04:30 -05:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Fox McCloud
db18224eb0 Merge pull request #7090 from ZomgPonies/superheroes2 
Superheroes update
 2017-04-16 17:48:52 -04:00
KasparoVy
e349153c54 OOPs. Trims unnecessary code, some small fixes 
Cuts down on copypasta code by implementing a param handling proc in
code\modules\mob\emote.dm.
 2017-04-14 21:55:20 -04:00
KasparoVy
080dd90721 Adds some Targeting to Emotes, Tidies up 
You can wink, buzz2, scream, smile, shake head, wave, nod and snap fingers at people now.
 2017-04-14 21:01:23 -04:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace 
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
 2017-04-14 18:15:12 +02:00
ZomgPonies
06ba71d003 Superheroes update 2017-04-11 19:53:08 -04:00
Fox McCloud
0edc5400b3 Merge pull request #7080 from SamHPurp/loyalty-to-mindshield 
Refactors any remaining Loyalty references to Mindshield
 2017-04-11 19:50:59 -04:00
Fox McCloud
14a2df684b Merge pull request #7071 from TravellingMerchant/kidanemote 
Adds Kidan specific emotes.
 2017-04-11 18:51:38 -04:00
Crazy Lemon
82312a4424 Merge pull request #7069 from TravellingMerchant/TravellingMerchant-patch-2 
Minor "bug" fixes. (Kidan changes.)
 2017-04-09 18:33:45 -07:00
Crazy Lemon
ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells 
Damn cells
 2017-04-09 13:55:30 -07:00
Crazy Lemon
cc649db525 Merge pull request #6894 from Fox-McCloud/abductor-hearts 
Abductor Gland Rework and Abductor Updates
 2017-04-09 13:40:01 -07:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
TravellingMerchant
a53af728ae Defines the new Kidan Emotes 2017-04-08 11:37:01 +01:00
TravellingMerchant
5a56b44c00 Allows Kidan to use underwear & undershirt, adds new suicide messages. 2017-04-07 21:43:40 +01:00
TravellingMerchant
41f755563e Changes Kidans colour-able antenna value from 0 to 1. 
Lets the Kidans
 2017-04-07 21:39:46 +01:00
TravellingMerchant
b4c575ae4c Defines the new IPC accessories. 2017-04-06 04:45:29 -07:00
Crazy Lemon
f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull 
Converts Most Destroys to use QDEL_NULL
 2017-04-05 23:49:19 -07:00
Fox McCloud
a0b649ba41 Merge pull request #7027 from KasparoVy/hairstuff 
Adds/Updates Some Vulp., Taj. & Unathi (Facial) Hair/Head Accessory Styles
 2017-04-05 18:57:37 -04:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Crazy Lemon
ba8b1dae55 Merge pull request #7038 from Fox-McCloud/the-qdelening 
More qdel and Destroy Fixes
 2017-04-04 19:03:45 -07:00
Crazy Lemon
b951941c6a Merge pull request #6784 from FalseIncarnate/fluff 
FullofSkittles Custom pAI & Silicon Fluff Tweaks
 2017-04-04 18:56:51 -07:00
monster860
7d0f5cb400 Fixes 
- Makes it so that log_client_to_db is called before mob/Login()
- Makes it so can_vote() doesn't runtime if the player_age isn't a number
 2017-04-04 18:50:24 -04:00
Fox-McCloud
fb02933f30 For qdel and Destroy Fixes 2017-04-03 19:06:20 -04:00
KasparoVy
b5b27cf901 Horn Icon State/Datum Name Fixes 
Woops.
 2017-04-02 05:12:58 -04:00
Fox-McCloud
35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Fox McCloud
f83b48f26a Merge pull request #6997 from Crazylemon64/ghostbeacon_rerouting 
Allows rerouting of ghost beacons
 2017-04-01 17:46:22 -04:00
Crazy Lemon
7687d3775f Merge pull request #6859 from Fox-McCloud/so-scarry 
Removes "Scarry Sounds" Random Loop
 2017-03-30 18:36:57 -07:00
Fox-McCloud
c08c13689c Merge remote-tracking branch 'upstream/master' into tesla-tweaks 2017-03-30 17:38:04 -04:00
Fox McCloud
b4e512d259 Merge pull request #6962 from davipatury/effect-to-structure 
Ports /tg/ obj damage system - Part 1
 2017-03-30 17:34:26 -04:00
davipatury
1673340c2d effect/effect/foam to structure/foam 2017-03-30 10:48:16 -03:00
Crazylemon64
2165d5db6f Allows rerouting of ghost beacons 2017-03-30 03:16:06 -07:00
KasparoVy
5bfdfbe1b7 Adds Tajaran Facial Hair Style 2017-03-30 02:11:16 -04:00
KasparoVy
b35fd6944f Adds a Bunch of Unathi (Facial)Hair/Head Accessory Styles 
Most courtesy of Polaris (I think that's where the sprites are from). The Dorsal Frill style was my own, however.
 2017-03-30 02:11:16 -04:00
KasparoVy
2554d3deac Adds some Vulpkanin Hair/Head Accessories & Updates Others 
Adds Vulpkanin Punk Braided, Short Alt. & Rough-Cropped Mane hairstyles.
Updates Vulpkanin Kajam & Adhara hairstyles.
Adds Vulpkanin Elder & Slash facial hairstyles.
Adds Vulpkanin Elder, Slash & Nose Alt. head accessories.
Adds Vulpkanin Nose Alt. head marking.
 2017-03-29 06:34:50 -04:00
KasparoVy
162f5602b1 Unique variable name. 
For better readability.
 2017-03-28 23:04:45 -04:00
KasparoVy
11953761fa Advanced Alcoholism 
You can now click-drag drink containers onto yourself to start chugging.
 2017-03-28 22:57:01 -04:00
Fox McCloud
00d8a089cd Merge pull request #6953 from tigercat2000/airlocks_ree 
Completely remove second power/backup wire from airlocks.
 2017-03-28 18:57:03 -04:00
Fox McCloud
44c17bc174 Merge pull request #6958 from KasparoVy/VoxBones2 
Vox take 20% more brute damage. Fragile bird bones!
 2017-03-28 18:55:16 -04:00
KasparoVy
63564653bb Skrell can now choose undergarments. 2017-03-28 17:25:51 -04:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
davipatury
82bfd6e4b3 effect/spacevine to structure/spacevine 2017-03-27 18:51:08 -03:00
FalseIncarnate
6c45afa492 Blaming Java 
Accidentally included end-of-line semi-colons. Blaming Java experience.
 2017-03-27 11:16:43 -04:00