cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,753 Commits 26 Branches 2 Tags
c8e94bb7af6dd4e4862ed86daaafa4e7233f2260
Commit Graph

6469 Commits

Author SHA1 Message Date
Tastyfish
71a7f10b7f Unbroke the pda manifest 2016-05-05 20:36:32 -04:00
TheDZD
7d6986a650 Merge pull request #4346 from Fox-McCloud/overdose-rework 
Overdose Rework and Food Poisoning
 2016-05-04 20:52:37 -04:00
TheDZD
d5d26a39a7 Merge pull request #4340 from Fox-McCloud/minor-rev-tweaks 
Minor Rev Balance Tweaks
 2016-05-04 18:08:42 -04:00
Fox-McCloud
9dca286988 tweaks and additions 2016-05-04 03:12:58 -04:00
Fox McCloud
c70c8d9c39 Merge pull request #4304 from Aurorablade/JustTraitorThings 
Crazy Fethas Traitor Emporium of Horrors
 2016-05-04 01:22:13 -04:00
Fox-McCloud
b295e7809e Overdose Rework 2016-05-03 19:55:11 -04:00
Fox-McCloud
1044c5fc88 Minor Rev Tweaks 2016-05-02 20:12:17 -04:00
Tastyfish
f2cae8f530 Fixes hostiles runtiming 2016-05-01 01:40:47 -04:00
Aurorablade
dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
IK3I
8d18ce19df Incorporates Suggestions for code format 
Redoes get_damaged_organs() to use defines and flags instead of strings.
 2016-04-29 21:43:19 -05:00
Fox-McCloud
f1acc84b8c Merge remote-tracking branch 'upstream/master' into hair 2016-04-29 19:48:49 -04:00
Fox McCloud
e34fa95fae Merge pull request #4187 from QuinnAggeler/Paradise-drask 
New race, the Drask
 2016-04-29 19:40:45 -04:00
Aurorablade
7e405427aa changess 2016-04-29 02:09:05 -04:00
HugoLuman
4b52de7791 Sets the right alarm levels, removes ptless else 2016-04-28 18:45:21 -07:00
Fox McCloud
ad16e065af Merge pull request #4314 from Crazylemon64/autosay_fix 
Fixes autosay to no longer create AIs for their messages
 2016-04-28 20:23:37 -04:00
HugoLuman
e255434a8f Adds the new alerts to Drask breath code 2016-04-28 16:36:44 -07:00
HugoLuman
97e07ba05f Fixes copy error, outdated alert code 
Removes outdated alert code for breath temperatures, fixes copy error in regen tier 1
 2016-04-28 16:15:39 -07:00
Fox McCloud
8892def83c Merge pull request #4289 from pinatacolada/pman 
Plasma security now spawn with their gun in the bag
 2016-04-28 18:39:41 -04:00
Fox-McCloud
d29ceda262 Merge remote-tracking branch 'upstream/master' into hair 2016-04-28 18:37:56 -04:00
Crazylemon64
501fa17958 Fixes autosay to no longer create AIs for their messages 2016-04-28 14:53:52 -07:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
Tastyfish
f8ebf7d672 Fixes reviving while restrained 2016-04-27 04:22:47 -04:00
pinatacolada
e961d51472 removes judge dred 2016-04-27 01:39:29 +01:00
HugoLuman
5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 
# Conflicts:
#	icons/mob/human_face.dmi
 2016-04-26 17:32:04 -07:00
Fox McCloud
c07b0130f1 Merge pull request #4297 from FlattestGuitar/examine 
Fixes Unathi examine message.
 2016-04-26 19:34:52 -04:00
TheDZD
8488c976e8 Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR 
Refactor FBP Parts & Adds Prosthetic Brand Models & More Antennae & Continued....
 2016-04-26 19:15:19 -04:00
TheDZD
ebb124dfc9 Merge pull request #4282 from QuinnAggeler/IPCfix 
Fixes braindead IPC death message spam
 2016-04-26 19:14:10 -04:00
HugoLuman
09faec8ffa Removes tier 4 regen 
Max regen now 3 brute/burn every 4 ticks (~8 seconds)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-26 16:12:53 -07:00
Mieszko Jędrzejczak
73affd479e GODDAMN LIGGERS 2016-04-26 21:55:14 +02:00
Fox-McCloud
371a122430 Hair Request 2016-04-26 01:26:24 -04:00
Fox-McCloud
a4dce5dd5f Nutrition Fix 2016-04-25 23:30:55 -04:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE 
-tg- HUD styles
 2016-04-25 19:57:59 -04:00
TheDZD
98a94a37d5 Merge pull request #4273 from FlattestGuitar/examine 
Makes a human's species visible on examine.
 2016-04-25 18:37:17 -04:00
TheDZD
f65910c3d9 Merge pull request #4274 from tigercat2000/attackpref 
#4243 preference option
 2016-04-25 18:34:48 -04:00
TheDZD
cdc20258a1 Merge pull request #4212 from Tastyfish/bans 
Cleans up special role jobbans
 2016-04-25 18:34:37 -04:00
TheDZD
6e71809d5e Merge pull request #4272 from Fox-McCloud/injections 
Fixes Several Injections
 2016-04-25 17:17:58 -04:00
pinatacolada
ee40390ffe Plasma security now spawn with their gun in the bag 
Fixes #4071

Warden, officers, and pod pilot spawn with the taser in their bag.
Head of Security spawns with egun in the bag.
Brig physician spawns with pen light in their bag.
Also made other species pod pilots spawn with the taser in their bomber
jacket, since it now can hold it, and is more consistent with the rest
of the officers

🆑 pinatacolada
fix: Plasmamen security now spawn with their suit slot items in their
bags
tweak: Pod pilots spawn with taser in the suit slot
/🆑
 2016-04-25 17:47:46 +01:00
Mieszko Jędrzejczak
399fe7cdc2 slime people whoopsie 2016-04-25 12:50:45 +02:00
Fox McCloud
ff2da1c159 Merge pull request #4238 from Aurorablade/Kungfu 
Fethas Carnival of Horrors:crouching tarajan,hidden unathi
 2016-04-25 04:35:35 -04:00
HugoLuman
f16dc32686 Fixes IPC deathgasp spam 
Adds a brain damage threshold to the can_revive_by_healing proc to prevent braindead IPCs from continually dying and reviving.

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-24 16:00:28 -07:00
Tigercat2000
57648bd6b7 Fix multiple instances of to_chat not being used 2016-04-23 20:45:37 -07:00
Tigercat2000
d08cb0db9c Adds a preference setting to the "ghost item attack" thing 2016-04-23 17:31:52 -07:00
TheDZD
5be973de20 Merge pull request #4243 from Fox-McCloud/attack-animations 
Ports TG's Improved Attack Animations
 2016-04-23 20:30:38 -04:00
Mieszko Jędrzejczak
038ca241c6 Fixes the fixes 2016-04-23 20:26:54 +02:00
TheDZD
e09f708f2c Merge pull request #4254 from Meisaka/enoughwiththesss 
Make silicon/AI/robot/drone/pAI emotes sane again.
 2016-04-23 10:20:39 -04:00
Mieszko Jędrzejczak
3151b7f3bd A human's species will now be visible on examine. 2016-04-23 12:21:14 +02:00
Fox-McCloud
e9010971bf Fixes Several Injections 2016-04-23 03:45:29 -04:00
TheDZD
f69ff5f30a Merge pull request #4264 from Fox-McCloud/mining-crate 
Updates Mining Loot Crates
 2016-04-22 23:57:32 -04:00
Fox-McCloud
6da5d4f1fc re-add things 2016-04-22 22:36:03 -04:00
Aurorablade
cb38f7b0f9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 21:45:18 -04:00