cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,872 Commits 14 Branches 2 Tags
2b767bb9c98dc71756349df80fbfc13be2152c1c
Commit Graph
31872 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi
 2017-01-31 17:44:38 +01:00
ParadiseSS13-Bot 50117386c3 Automatic changelog compile, [ci skip] 2017-01-31 02:00:14 -05:00
ParadiseSS13-Bot a84d4a1b8d Automatic changelog generation for PR #6152 [ci skip] 2017-01-31 01:30:40 -05:00
Fox McCloudandGitHub 0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash 
Window Flashing
 2017-01-31 01:30:39 -05:00
ParadiseSS13-Bot d7e1362d9d Automatic changelog generation for PR #6178 [ci skip] 2017-01-31 01:26:22 -05:00
Fox McCloudandGitHub c9b4a951ae Merge pull request #6178 from FalseIncarnate/NTPS 
NTPS: Requests Console Based Shipping
 2017-01-31 01:26:21 -05:00
Crazy LemonandGitHub d76df747c5 Merge pull request #6272 from Markolie/fixxxxx 
Give brains Galactic Common language
 2017-01-30 22:02:34 -08:00
Crazy LemonandGitHub dcc3df2118 Merge pull request #6278 from tigercat2000/saycodefix 
Add slot_collar, remove simple_animal add_inv/remove_inv
 2017-01-30 22:01:27 -08:00
Crazy LemonandGitHub e7e22f5dff Merge pull request #6273 from Kyep/names_fix 
Fixes some mobs being invisible in Check_antagonists
 2017-01-30 21:59:33 -08:00
Crazy LemonandGitHub 154e08bf10 Merge pull request #6282 from Kyep/ca_initial_xenos 
Fixes initial Xenomorphs not appearing in Check Antagonists
 2017-01-30 21:56:09 -08:00
ParadiseSS13-Bot fc5c0ec5cf Automatic changelog generation for PR #6242 [ci skip] 2017-01-31 00:54:06 -05:00
Crazy LemonandGitHub 88e05849a9 Merge pull request #6242 from Aurorablade/MiddleFinger 
Bugsie:Stupid Rune Edition
 2017-01-30 21:54:05 -08:00
ParadiseSS13-Bot 9e14e8d479 Automatic changelog generation for PR #6254 [ci skip] 2017-01-31 00:43:16 -05:00
Fox McCloudandGitHub 0283e75fe5 Merge pull request #6254 from FlattestGuitar/erifle 
Adds a laser carbine!
 2017-01-31 00:43:15 -05:00
Fox McCloudandGitHub 0466fde8a3 Merge pull request #6270 from FlimFlamm/newspaper_re-sprite 
Newspaper re-sprite (lightens, colorizes)
 2017-01-31 00:42:07 -05:00
Fox McCloudandGitHub 323bb9f299 Merge pull request #6281 from Kyep/cc_idconsole 
Loosens restrictions on CC ID computer
 2017-01-31 00:26:22 -05:00
ParadiseSS13-Bot 0b4ae18b9c Automatic changelog compile, [ci skip] 2017-01-31 00:00:11 -05:00
ParadiseSS13-Bot a8876ee5f4 Automatic changelog generation for PR #6239 [ci skip] 2017-01-30 23:46:44 -05:00
Fox McCloudandGitHub 4842d77882 Merge pull request #6239 from Ar3nn/cluwnescanbreathetoo 
Cluwne Mask now allows internals usage
 2017-01-30 23:46:42 -05:00
Crazy LemonandGitHub ccb52d6277 Merge pull request #6283 from Fox-McCloud/gc-info-update 
Removes Oudated GC Info
 2017-01-30 17:56:58 -08:00
FlimFlamm 7bf1566bd8 This commit modified Bureaucracy.dmi for the third time in a series of attempted sprite modifications to "newspaper" designed to increase it's visibility. This iteration is very minimalist and modifies a grand total of three pixels which should give the illusion of a red logo in the corner of the news paper (will contrast with gray paper and gray floor) 2017-01-30 18:37:13 -04:00
Fox-McCloud ab6fffa4dc Removes Oudated GC Info 2017-01-30 03:01:29 -05:00
Kyep fe65d6827d No blacklist for admins 2017-01-29 21:37:48 -08:00
ParadiseSS13-Bot d6bb3f21c5 Automatic changelog compile, [ci skip] 2017-01-30 00:00:18 -05:00
ParadiseSS13-Bot 61519cd9a5 Automatic changelog generation for PR #6276 [ci skip] 2017-01-29 23:51:04 -05:00
Fox McCloudandGitHub b43e97a452 Merge pull request #6276 from Alexshreds/doubletraitor 
Bans 2-4-1 Traitor Special
 2017-01-29 23:51:03 -05:00
Kyep 6d6eec5934 Fixes initial Xenomorphs not appearing in Check Antagonists 2017-01-29 18:48:51 -08:00
Kyep f0005ea578 Also allows CC to modify job slots for cyborg, blueshield, NT rep, chaplain 2017-01-29 18:17:53 -08:00
Kyep 146e79a48e Removes cooldown from CC ID computer 2017-01-29 18:03:23 -08:00
Tigercat2000 4e56bb9636 Add slot_collar, remove simple_animal add_inv/remove_inv 
This is being done to remove the simple_animal/Topic() override.
 2017-01-29 13:26:54 -08:00
Chakirski bf4e605700 removes_parent_call 2017-01-29 12:51:04 -06:00
ParadiseSS13-Bot bfe630ad6c Automatic changelog compile, [ci skip] 2017-01-29 07:00:18 -05:00
ParadiseSS13-Bot 44e53c214a Automatic changelog generation for PR #6259 [ci skip] 2017-01-29 06:20:32 -05:00
Fox McCloudandGitHub 2fc2b85079 Merge pull request #6259 from uraniummeltdown/clicc 
Make Boxes Great Again
 2017-01-29 06:20:31 -05:00
Kyep 46f409ddfb Fixes some mobs being invisible in Check_antagonists 2017-01-28 15:25:20 -08:00
Markolie d65cc380fa Give brains Galactic Common language 2017-01-29 00:06:00 +01:00
Crazy LemonandGitHub d7ae5c4a7e Merge pull request #6266 from Fox-McCloud/pill-fix 
Fixes Dental Pill being an internal organ
 2017-01-28 01:40:26 -08:00
FlimFlamm 011e839774 This commit alters the "newspaper" sprite in "bureaucracy.dmi" (again) to replace the solid black borders with a lighter gray border and also to change some of the text from solid black to dark black. This makes the sprite look more believably made out of paper and avoids a potential faux-pas regarding the use of solid black borders. 2017-01-28 02:05:12 -04:00
FlimFlamm 3864f0b2ea This commit updates "bureaucracy.dmi" with a recolored version of the "newspaper" sprite located within in "icons/obj/bureaucracy.dmi". Specifically the sprite is changed from gray and black (non color news-paper look) to a more modern white and black /w color headline and photos. This is the second sprite change in a series of informally planned PR's designed to improve the quality of news delivery in SS13 2017-01-28 01:11:41 -04:00
ParadiseSS13-Bot 611dc0f78d Automatic changelog compile, [ci skip] 2017-01-27 22:00:10 -05:00
ParadiseSS13-Bot 2f4688d035 Automatic changelog generation for PR #6202 [ci skip] 2017-01-27 20:18:20 -05:00
Fox McCloudandGitHub e1e0824418 Merge pull request #6202 from uraniummeltdown/xenobio 
Slime Transference Potion
 2017-01-27 20:18:19 -05:00
ParadiseSS13-Bot 1eebd093f9 Automatic changelog generation for PR #6265 [ci skip] 2017-01-27 20:08:33 -05:00
Fox McCloudandGitHub 5568736c45 Merge pull request #6265 from Allfd/sprite-fixes 
Fixes accidental deletion of sprites
 2017-01-27 20:08:32 -05:00
ParadiseSS13-Bot d4b6dc65c9 Automatic changelog compile, [ci skip] 2017-01-27 20:02:56 -05:00
Fox-McCloud b24be686d0 Fixes Dental Pill being an internal organ 2017-01-27 20:02:06 -05:00
Crazy LemonandGitHub cd31694e12 Merge pull request #6253 from fludd12/GhostBar 
Respawner Machine (Attempt Deux)
 2017-01-27 16:59:36 -08:00
ParadiseSS13-Bot 7de7f49ccc Automatic changelog generation for PR #6199 [ci skip] 2017-01-27 19:57:14 -05:00
Crazy LemonandGitHub 04d1b30a7b Merge pull request #6199 from Fox-McCloud/stun-gloves 
Adds in Stun Gloves
 2017-01-27 16:57:13 -08:00
Alffd 91a188095e Fixes accidental deletion of sprites 2017-01-27 19:43:13 -05:00