cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

88 Commits

Author SHA1 Message Date
Fox-McCloud
5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Fox-McCloud
a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins 
Crazypilot's Space Ruins Port
 2016-07-15 22:55:51 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
Crazylemon64
0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
FreeStylaLT
fb12e713a7 LETS ALL TAKE A MOMENT TO REMEMBER TO USE MAPMERGER. ESPECIALLY ME. PLEASE. FOR THE SAKE OF ALL THAT IS HOLY PLEASE. 2016-07-02 18:26:20 +03:00
TheDZD
df961b29bc Merge pull request #4829 from Fox-McCloud/patch-the-patches 
Instant Patch Features
 2016-07-01 22:08:27 -04:00
TheDZD
506f6885a8 Merge pull request #4834 from Fox-McCloud/emote-revert 
Reverts Emote System
 2016-07-01 20:36:40 -04:00
Fox-McCloud
fa240a7c56 tweaks 2016-07-01 19:59:09 -04:00
Tastyfish
4dd64607dd Makes Space Hotel Great Again (#4700) 2016-06-30 20:42:29 -04:00
Fox-McCloud
a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
Fox-McCloud
cf1a584995 Instant Patch Features 2016-06-30 09:55:35 -04:00
Crazylemon64
a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
Matt Milosevic
a162488f03 Totally refactors and updates the ruins code 2016-06-03 21:26:25 +02:00
VampyrBytes
df3b180af4 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2 2016-05-26 12:32:47 +01:00
Fox McCloud
4735879fc6 Removes Ghost Chilli Juice and Dragon's Breath (#4495) 2016-05-25 17:09:18 -04:00
VampyrBytes
9e0d053143 fixes conflicts 2016-05-10 04:12:55 +01:00
FalseIncarnate
a68ddb1116 Global Intercom list, minor code cleanup round 2 2016-05-06 03:20:00 -04:00
VampyrBytes
f852d98235 Datum Emotes MK II 2016-05-04 15:52:34 +01:00
Fox-McCloud
5145825470 Part 4 2016-04-17 22:48:05 -04:00
Tastyfish
178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs 
Ports SNPCs
 2016-04-11 20:44:50 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tigercat2000
801cbe7f8d Alternate Appearance system (from tgstation/-tg-station#16586) 
This adds an "alternate appearance system" using image overrides and a new
handler system.

Usage:
 - Create a new `image()` casted as `var/image`
 - Set image.override = 1
 - Call mob.add_alt_appearance("appearance_ID", image, listOfMobsToDisplayTo).
 - To remove an image, you use mob.remove_alt_appearance("appearance_ID")

Comes with one usage, cardborg costumes. They will now disguise you as a
standard borg to any silicon mobs and yourself.
As this is a per-client system, that means that only silicon mobs and you will
see yourself as a standard borg. All other mobs will see you as a silly
human in a cardborg costume.
 2016-04-06 13:58:03 -07:00
Fox-McCloud
3bd37ec757 Simple Animal Spawn Refactor 2016-04-04 00:30:10 -04:00
Tastyfish
6a8ea815b2 Merge branch 'master' into buttbots2 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
 2016-03-31 13:33:46 -04:00
Fox-McCloud
6b5e1904f5 tweaks 2016-03-28 22:28:19 -04:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
KasparoVy
98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish
492ed2f16e Corrects CentComm spelling 2016-02-22 04:39:10 -05:00
Aurorablade
f352c290de end conflict fix 2016-01-21 21:34:16 -05:00
Aurorablade
363da58264 being conflict fix 2016-01-21 20:50:24 -05:00
Fox-McCloud
8c229280d2 consistency helps 2016-01-16 04:44:56 -05:00
Fox-McCloud
ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Aurorablade
92e15c1b2a BREAK ALL THE THINGS 2015-12-31 01:23:44 -05:00
KasparoVy
366d05f745 Generalization + Features for Other Species 
Turns horns into head accessories, fixes some species checks, gets
Tajara and Vulpkanin into the mix, ensures the system cannot be
exploited, adds species-specific body markings for Tajara, Vulpkanin and
Unathi.
 2015-12-28 01:02:23 -05:00
KasparoVy
8bbd18846d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-27 18:44:45 -05:00
FalseIncarnate
81ce03572b Evil Santa Fixes/Tweaks 
Adds all Santa mobs to the global blocked_mobs list
- Will prevent gold cores and rifts from spawning stage 2 santas

Gives Final Form Santa (Stage 4) a small buff to health and minimum
damage
- All other stages left unchanged, Stage 4 was just a bit lackluster for
a "final form"

Fixes melee snowmen not ever dropping the brand new CANDY SWORD. They
now will have a 50% chance.
- It's a sharpened candy cane. Festive and painful.
- Ranged snowmen do not drop the candy sword, as they don't carry a
weapon.
 2015-12-26 23:54:24 -05:00
KasparoVy
be3bb885f2 Melting Snowflakes & (Adds/Changes Frills & Adds Body Markings) 2015-12-26 00:48:01 -05:00
KasparoVy
0f8f514671 Adds Unathi Horn and Tail Customization 
Does not include tail colour correction.
In this iteration, the horns do not have their own colour-- they use the
skin colour.
 2015-12-21 22:55:39 -05:00
Tigercat2000
356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 
Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm
 2015-12-03 11:03:01 -08:00
Tigercat2000
e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Aurorablade
6821031ea7 PATCH 2015-12-02 23:47:55 -05:00
Fox-McCloud
6e52aa2750 blocks statues 2015-11-27 01:43:11 -05:00