cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 09:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,873 Commits 28 Branches 2 Tags
fc8ea82c1b2b4c814776dd345277458e484fec79
Commit Graph

16429 Commits

Author SHA1 Message Date
TDSSS
fc8ea82c1b NT rep access change. 2019-02-11 03:23:23 +01:00
variableundefined
a9ce346fd2 Merge pull request #10849 from Fox-McCloud/switch-straps 
Allows Leather Satchel Strap Switching
 2019-02-10 15:46:51 +08:00
variableundefined
7b5afbadc8 Merge pull request #10838 from Fox-McCloud/defib-nerf 
Reduces Defib Safe Time: Adds Health HUD Defib Indicator
 2019-02-09 13:28:43 +08:00
Fox McCloud
d61fa732f3 Allows Leather Satchel Strap Switching 2019-02-08 16:46:07 -05:00
variableundefined
24661d2c44 Merge pull request #10833 from Kyep/ends_geezer_cheat 
Removes age-based weighting for head/captain job selection
 2019-02-08 19:36:56 +08:00
Dovixx
7938ca62b1 Update talisman.dm 2019-02-07 12:22:24 +02:00
Fox McCloud
dc09d07d86 Reduces Defib Safe Time: Adds Health HUD Defib Indicator 2019-02-07 00:49:24 -05:00
Kyep
420ff9f540 prevent possible really rare runtime 2019-02-06 04:39:24 -08:00
Kyep
3a530cb039 remove all age-based weighting in head job selection 2019-02-06 04:37:54 -08:00
Kyep
84451f8e48 Reduces captain ageism 2019-02-06 04:26:37 -08:00
taukausanake
b7ce683ab1 Merge branch 'pai_light' of https://github.com/Tayyyyyyy/Paradise into pai_light 
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
	code/game/objects/items/devices/flashlight.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm

 Changes to be committed:
	modified:   code/game/gamemodes/shadowling/shadowling_abilities.dm
	modified:   code/game/machinery/computer/computer.dm
	modified:   code/game/machinery/floodlight.dm
	modified:   code/game/objects/items/devices/flashlight.dm
	modified:   code/game/objects/items/devices/paicard.dm
	modified:   code/modules/clothing/head/hardhat.dm
	modified:   code/modules/clothing/spacesuits/hardsuit.dm
	modified:   code/modules/clothing/spacesuits/plasmamen.dm
	modified:   code/modules/lighting/lighting_atom.dm
	modified:   code/modules/mob/living/carbon/human/human.dm
	modified:   code/modules/mob/living/living.dm
	modified:   code/modules/mob/living/silicon/pai/pai.dm
	modified:   code/modules/mob/living/silicon/pai/software_modules.dm
	modified:   code/modules/mob/living/silicon/robot/robot.dm
	modified:   code/modules/pda/PDA.dm
	modified:   code/modules/power/lighting.dm
	modified:   code/modules/projectiles/gun.dm
 2019-02-02 22:53:46 -06:00
variableundefined
7bc5c9fc0c Merge pull request #10812 from Fox-McCloud/no-cure 
Ensures Some Diseases Cannot Be Cheesed
 2019-02-03 08:22:44 +08:00
Fox McCloud
01d20eb7af Ensures Some Diseases Cannot Be Cheesed 2019-02-02 17:50:05 -05:00
variableundefined
58e3c95c81 Merge pull request #10778 from MINIMAN10000/helpful-push 
Mobs on help intent no longer push structures or mobs that are pulling structures
 2019-02-02 21:05:00 +08:00
Kyep
00187ad971 Updates show player playtime report 2019-02-01 23:46:29 -08:00
variableundefined
1e22ffa784 Merge pull request #10793 from AzuleUtama/iveGotAPresentForYa 
Adds Pack of C-4 Explosives
 2019-02-02 09:45:10 +08:00
Fox McCloud
f9aa125eb5 Merge pull request #10796 from Citinited/sexy-clowns-oh-god 
Repaths sexy clown stuff to be subtypes of the existing clown items
 2019-02-01 17:48:18 -05:00
Citinited
41ac5e0027 Repath of sexy clown gear: part 1 2019-02-01 21:46:58 +00:00
variableundefined
c8ebc3034e Merge pull request #10759 from datlo/garbledwingdings 
Wingdings now garble sentences
 2019-02-01 10:32:30 +08:00
variableundefined
d382fa1c7c Merge pull request #10761 from datlo/agentidfixes 
Refactors agent ID phototaking, misc ID fixes/improvements
 2019-02-01 10:17:08 +08:00
variableundefined
4f38ce3bc5 Merge pull request #10732 from Darkmight9/Camera-Flash 
Camera flash
 2019-01-31 20:09:27 +08:00
variableundefined
d26a08e373 Merge pull request #10768 from datlo/itspaydayfellas 
Updates syndi kits, add armored suit jacket
 2019-01-31 11:30:27 +08:00
variableundefined
2cff4b35c5 Merge pull request #10777 from Kyep/admin_room_fix 
Fixes blast door buttons, refactors buttons to remove range var
 2019-01-31 11:04:45 +08:00
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
AzuleUtama
d826f51dcb Adds the pack of c4 explosives 2019-01-31 01:50:32 +00:00
Aurorablade
afc6ad524f DMI File Casing Rename 2019-01-30 20:09:39 -05:00
MINIMAN10000
3c86acdfa3 moved isstructure define from structures code to define is_helpers 2019-01-30 11:19:27 -08:00
MINIMAN10000
80322feeb5 mobs on helpful intent no longer push pulled structures or players pulling structures, structure.dm follows mob.dm's issilicon for isstructure as per contributing no hacky code, pulledby now set to null when stop_pulling() is called, thus they actually stop pulling 2019-01-29 21:09:53 -08:00
Kyep
a23c55a541 Eliminates 'range' var from door_controls, uses tags/zlevel instead 2019-01-29 18:13:23 -08:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
datlo
a2ee8a0d7e Updates syndi kits, add armored suit jacket 
- Adds two suit jackets to the arrivals locker vendor
- Adds the armored suit jacket to armors. Same defense as standard
security armor.
- Adds the executive suit and armored jacket to Bond, Payday, and
Professional syndi kits
- Replaces the X4 in Payday by a C4
- Reskins the thermal glasses in Professional to look like sunglasses.
Does not provide flash protection.
- Replaces the toolbox in professional by a pair of combat gloves.
 2019-01-28 18:37:58 +00:00
variableundefined
79304237d1 Merge pull request #10757 from datlo/abductorfixes 
Remove flavor text on abductor, add SE clean I missed
 2019-01-28 21:15:57 +08:00
variableundefined
21e73ee4d4 Merge pull request #10755 from AzuleUtama/binaryKeyKey 
Binary Key Description Fix
 2019-01-28 21:14:03 +08:00
variableundefined
1c71e4ef14 Merge pull request #10752 from Shadeykins/Z6-Remap2 
Updates z6.dmm, Derelict/DJ Station/Teleporter Remap & Clown Shuttle Fix
 2019-01-28 19:03:26 +08:00
AzuleUtama
fea9ad2bae Its actually this 2019-01-27 22:08:10 +00:00
datlo
38384e5058 Add all syndicate access to syndicate_command id 2019-01-27 21:25:58 +00:00
datlo
94f6ae5c49 split "reset card option" in two 2019-01-27 21:18:24 +00:00
datlo
33dc194469 ID/Agent ID fixes 
1. Clown and mime get their new name updated properly on their ID after
renaming
2. Added photo outfits to jobs missing it and some syndicate jobs :
Syndicate Officer
Syndicate Agent
Syndicate Nuclear Operative
Clown (no mask in photo)
Mime (no mask in photo)
Coroner
Barber
3. Agent ID description now update with chosen appearance
4. Agent ID photo taking now uses the same proc as a real ID photo, so
they actually look authentic.
The photo is no longer a snapshot of your current mob icon, but instead
forge a photo the same way IDs do, with an outfit matching the job
you've forged on the ID.
5. Agent ID age field when editing now defaults to your real age, as
other fields for it do
 2019-01-27 20:36:51 +00:00
datlo
12c88785eb Wingdings now garble sentences 2019-01-27 16:33:07 +00:00
datlo
522bb2b690 Remove flavor text on abductor, clean SE of science 2019-01-27 14:33:34 +00:00
AzuleUtama
ca957abb62 Binary Key Description Fix 2019-01-27 12:56:06 +00:00
Shadeykins
30416b7d67 Fixes runtimes in icon_smoothing, updates a few turfs. 2019-01-27 04:34:44 -07:00
variableundefined
5006d730dd Merge pull request #10738 from Citinited/duct-tape-fix 
Can apply tape to some more items, can't apply tape to intercoms
 2019-01-27 18:27:32 +08:00
Shadeykins
f5a1257abd Updates files. 2019-01-27 00:56:01 -07:00
variableundefined
920395cc7e Merge pull request #10395 from granodd/GunsAndGunAccessories 
New Gun Sounds
 2019-01-27 10:37:03 +08:00
variableundefined
bda47bd994 Merge pull request #10745 from Kyep/stop_murdering_admins 
Fixes #10729 - objectives targeting admin centcom characters
 2019-01-27 09:40:57 +08:00
Kyep
ede5217093 switch to is_level_reachable 2019-01-26 17:23:20 -08:00
Kyep
ad6c866f8f Stops objectives targeting admin centcom characters 2019-01-26 17:15:23 -08:00