cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-21 06:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,621 Commits 28 Branches 2 Tags
eed61ed46cf4f80b759d13c9682a04a9ce79d69e
Commit Graph

1743 Commits

Author SHA1 Message Date
ZomgPonies
497a113bf3 Atmosia flag! All departments are covered...now to code nations gamemode. 2014-05-24 14:32:51 -04:00
ZomgPonies
55de2b38a7 Wizard flag 2014-05-24 13:09:10 -04:00
ZomgPonies
08b69878f7 Only atmosia flag left to do! 2014-05-24 12:27:55 -04:00
ZomgPonies
463537e9a2 Bunch of new flags. 2014-05-24 11:38:32 -04:00
ZomgPonies
029ce0b1ca Syndi flag + more flag organizing. 2014-05-24 10:56:48 -04:00
ZomgPonies
162b936bd3 Fixed up in-hands and flags and shit jesus fucking BYOND christ 2014-05-24 10:40:38 -04:00
ZomgPonies
e1ce0ee664 Errr 2014-05-24 09:15:26 -04:00
ZomgPonies
b4f5df6d1d Made flags unable to fit in backpacks. 2014-05-24 09:11:27 -04:00
ZomgPonies
769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -04:00
ZomgPonies
838d746d6e Added an NT flag as decoration and added it to a bunch of places. ALL GLORY TO NANOTRASEN! 2014-05-19 04:36:59 -04:00
cloroxygen
c8b1fd08de 21 viro symptoms 
Im an idiot that cant use github edition

Conflicts:
	code/game/objects/effects/decals/Cleanable/humans.dm
	code/modules/virus2/effect.dm
 2014-05-17 19:17:35 -04:00
Rob Nelson
a2cfa562b3 Fix UI syringes not setting UI flag correctly. 2014-05-15 20:10:47 -04:00
jack-fractal
2754b56e0c adding the spirit entity code, fixing the cameraNet so that it compiles properly 
Conflicts:
	code/datums/visibility_networks/dictionary.dm
	code/game/machinery/doors/door.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
 2014-05-15 05:06:38 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode 
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
 2014-05-15 01:01:54 -04:00
alex-gh
b6b5e0a9fc Changed drone laws to be more VG like 2014-05-13 02:44:31 +02:00
Zuhayr
1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
 2014-05-12 02:59:53 -04:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
 2014-05-12 01:41:02 -04:00
SamCroswell
666a953c6c Requested Map Changes 2014-05-05 19:57:16 -04:00
MrPerson
320a06f8c9 Make sure clones don't already have a body 
CASE: Guy gets backed up at genetics. Guy gets facehugged. Guy pops as a xeno. Guy gets cloned. Alium is left clientless.

Conflicts:
	code/game/machinery/cloning.dm
 2014-05-04 17:06:20 -04:00
ZomgPonies
fbb53d240c Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-04 16:32:18 -04:00
Jarcolr
e3b27e3ecd Cyborg hud modules now have proper icons 
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png

Conflicts:
	code/game/objects/items/robot/robot_items.dm
 2014-05-04 16:31:49 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master 
Nukeops Weapons Rework
 2014-05-04 15:43:03 -04:00
SamCroswell
2d44352d0f Misc. changes 2014-05-04 09:37:28 -04:00
SamCroswell
521467fa3e C4 now explodes on detonation, Stechtkin pistol fix 
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
 2014-05-04 02:28:06 -04:00
ESwordTheCat
3c3e4c7dc8 Heh forgot these. 2014-05-03 22:54:24 -04:00
ESwordTheCat
532298c725 Tweak object pool system. 
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-05-03 22:54:09 -04:00
Zuhayr
e79097add3 Several IPC adjustments. 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-05-03 17:42:01 -04:00
Zuhayr
31e95baa78 Fixes for previous commit, sigh. 2014-05-03 17:38:01 -04:00
Zuhayr
75d8633fbe Adding some repair procs to cables and welders for IPC use. 
Conflicts:
	code/modules/power/cable.dm
 2014-05-03 17:37:46 -04:00
Zuhayr
7fe9b670f3 Fix for previous commit. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:35:55 -04:00
Zuhayr
9ec5a18e0b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:34:43 -04:00
ZomgPonies
36b52731f0 Changing power numbers to balance gun upgrades 2014-05-01 16:23:09 -04:00
Brian Cook
a78e54f33f Added missing header to pAI Request Module 
Also changed max frequency of radio config to 159.9 instead of 159.1
 2014-04-29 20:48:49 -04:00
Brian Cook
27a1d25b80 Added refresh button to host bioscan page 
Also tweaked all pAI GUI so the background doesn't repeat-y
 2014-04-29 20:48:39 -04:00
Brian Cook
cd8fb70a0b Centered background on pAI GUIs 2014-04-29 20:48:29 -04:00
Brian Cook
d0fa6b4fc6 Improved GUI for users interfacing with pAI 
Also minor tweak to GUI for requesting pAI.

Conflicts:
	code/game/objects/items/devices/paicard.dm
 2014-04-29 20:48:14 -04:00
Brian Cook
ce40b74fd7 Improved GUI for requesting pAI 
Made the pAI Request Module and the pAI Availability List pretty.

Conflicts:
	code/modules/mob/living/silicon/pai/recruit.dm
 2014-04-29 20:46:43 -04:00
Brian Cook
fa425b69a9 Fixed pAI Digital Messenger and layout tweaks 
Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
 2014-04-29 20:44:27 -04:00
Brian Cook
a93f864ae3 Refined GUI more 
pAI background updated and no longer externally referenced. Corrected
stray typos. Added more power on/off lights for certain downloaded
modules.
 2014-04-29 20:39:24 -04:00
Brian Cook
9149e2df96 pAI GUI changes 
The pAI GUI background image still need to be properly linked.
 2014-04-29 20:39:08 -04:00
Ccomp5950
143016dd07 Code effeciency project: HUD items rewrite 
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

Conflicts:
	code/modules/mob/living/living.dm

Conflicts:
	code/__HELPERS/mobs.dm
	code/datums/mind.dm
	code/game/objects/items/weapons/implants/implanter.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/virus2/helpers.dm
	code/setup.dm
	icons/mob/hud.dmi
 2014-04-29 20:34:28 -04:00
d3athrow
49c11d1c9e compile fuck 2014-04-29 13:27:06 -04:00
d3athrow
9951896b71 Can't greytide implant yourself 2014-04-29 13:26:45 -04:00
DJSnapshot
ab58107286 Fixes for Mloc, part 2. 
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
 2014-04-28 19:15:17 -04:00
DJSnapshot
cc9684fad5 fix for https://github.com/Baystation12/Baystation12/issues/4548 2014-04-28 19:10:39 -04:00
ZomgPonies
6d6592c60b Fixed IPC getting high from smokables 2014-04-28 19:05:27 -04:00
alex-gh
02aab3f779 Temporary revert for the new say code. 2014-04-24 10:28:52 +02:00
Mike
bf98751d8b Clean up check for item being equipped 
Moved some common code to item.dm. Someone should probably take a look
at get_equipped_items() in inventory.dm sometime in the future.
 2014-04-20 03:50:23 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog. 
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
 2014-04-19 20:47:41 -04:00
ESwordTheCat
c43652b33a Okay shards converted to pool usage now. 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-04-19 19:57:53 -04:00