cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,942 Commits 26 Branches 2 Tags
de86d562852f79bfe4a26f42dc140c6c411ff310
Commit Graph

7846 Commits

Author SHA1 Message Date
UmeFuu
923e372926 Deletes leftover code 2019-02-25 21:55:52 -03:00
UmeFuu
75f49c435c Fix typo 2019-02-13 21:34:36 -03:00
UmeFuu
c72a623ec6 Fixes cookie tray code 
Makes it kinda shorter, more flexible for future variations of cookies.
 2019-02-13 17:37:54 -03:00
UmeFuu
5db7dafc38 Adds new circular cutter 
Needed for the new cookies recipe and maybe future recipes
-----
Fixed, it didn't work before for some reason
 2019-02-13 00:16:17 -03:00
UmeFuu
4f371cb7c2 Adds trays with cookies 
Adds two trays, one with x6 cookies and the other with x6 sugar cookies, needed for the new cookies recipe.
 2019-02-12 20:28:54 -03:00
UmeFuu
ca2fa7c3b3 Adds new circular cutter 
Needed for the new cookies recipe and maybe future recipes
 2019-02-12 20:26:12 -03:00
variableundefined
943a21a776 Merge pull request #10818 from datlo/freegolems 
Port Mineral golems and Free Golems
 2019-02-11 20:37:07 +08: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
Fox McCloud
d61fa732f3 Allows Leather Satchel Strap Switching 2019-02-08 16:46:07 -05:00
Fox McCloud
dc09d07d86 Reduces Defib Safe Time: Adds Health HUD Defib Indicator 2019-02-07 00:49:24 -05:00
datlo
481208ae9c add robo access, space cleaners, fix bana golem bug 2019-02-05 02:51:40 +00:00
datlo
0358bfef42 fix bugs, remove cult free golems 2019-02-04 13:11:11 +00:00
datlo
4ca61d45de Update vendor items, update map for botany/xenobio 2019-02-04 02:10:40 +00:00
datlo
0ff947ec17 Added golem custom access, boards, and a free KA 
You must mine for the trigger guard kit before being able to use the KA
 2019-02-03 18:27:24 +00:00
datlo
e9e2d1a2e9 add ID registering 2019-02-03 16:59:59 +00:00
datlo
912c6b0b9e asteroid claim improvements, golem ship security 
Add plating over asteroid tiles if you've claimed them

Asteroid walls can now be used to define rooms (still must be airtight)

Add golem check to the free golem ship
 2019-02-03 15:59:04 +00:00
datlo
f06e88d82d Remove base access from golem ID, buff golem KA 2019-02-03 14:35:11 +00:00
datlo
224f32bab3 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-03 06:41:02 +00:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00: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
Fox McCloud
01d20eb7af Ensures Some Diseases Cannot Be Cheesed 2019-02-02 17:50:05 -05:00
datlo
f98da3edf8 Progress... 2019-02-02 17:51:25 +00: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
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
AzuleUtama
d826f51dcb Adds the pack of c4 explosives 2019-01-31 01:50:32 +00:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05: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
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
AzuleUtama
ca957abb62 Binary Key Description Fix 2019-01-27 12:56:06 +00: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
Kyep
7a3d9d460c Fixes runtime when double-clicking a stool item in hand 2019-01-26 16:30:27 -08:00
Darkmight9
6827be92fc Now with 100% less c+p! 2019-01-26 18:48:48 -05:00
variableundefined
1669fd51e8 Merge pull request #10734 from datlo/syndimedbody 
Adds the cyborg body analyzer to syndi medborgs
 2019-01-27 06:24:49 +08:00
Citinited
18b6846782 Can apply tape to some more items 2019-01-26 14:42:57 +00:00
variableundefined
7bab369b49 Merge pull request #10700 from datlo/bookforce 
Add force to books, extra to space law
 2019-01-26 19:45:34 +08:00
Granodd
6c53564df2 Merge branch 'master' into GunsAndGunAccessories 
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
 2019-01-26 02:17:22 -05:00
variableundefined
bbe744feae Merge pull request #10713 from datlo/flagrework 
Reworks chameleon flag
 2019-01-26 09:05:04 +08:00
variableundefined
39ae71ff87 Merge pull request #10719 from AzuleUtama/ALittleC4KnockingAtYourDoor 
Changes to C4's explosion handling
 2019-01-26 09:04:36 +08:00
datlo
613999bfc6 Syndicate medborgs now get body analyzer 2019-01-25 20:51:45 +00:00