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
16,090 Commits 28 Branches 2 Tags
2de66f51c8fb6d5d1fc9b4f231a6fa76f42e1738
Commit Graph

3199 Commits

Author SHA1 Message Date
d3athrow
68012f5017 Fixed a gamebreaking bug 
Conflicts:
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/life.dm
	maps/tgstation.2.1.0.0.1.dmm
 2014-03-22 06:22:55 -04:00
Aryn
072bdcde60 I think I fixed everything it is possible to stuff a light source into. 
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/Sleeper.dm
	code/game/objects/structures/transit_tubes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/recycling/disposal.dm
 2014-03-21 09:58:54 -04:00
Aryn
cff01f9df6 Fixed an annoying bug with giving another player a flashlight, 
opened up at least 100 individual bugs where people kept setting
loc and expecting light updates to catch it.

Conflicts:
	baystation12.dme
 2014-03-21 09:51:15 -04:00
Ccomp5950
007cd2ded4 PDA NanoUI bugfix. 
modes that update every 5 ticks won't require clicking the pda 5 times to get a UI window open.

We now check to see if a UI already exists if not we don't check
 2014-03-16 22:58:54 -04:00
Kzd1
2ac635aacf -fixed pulse destroyer projectiles not being able to destroy girders 2014-03-12 19:22:06 -04:00
Heredth
5d77dcecaa Added new vending machines, and changed a couple of other files. Might be worth looking through just to make sure I didnt fuck everything up 
Conflicts:
	code/game/machinery/vending.dm
 2014-03-11 06:11:12 -04:00
Rob Nelson
5c8ddf2a31 YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED 
Conflicts:
	code/__HELPERS/game.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/firedoor.dm
	code/modules/client/preferences_toggles.dm
	code/setup.dm
	maps/tgstation.2.1.0.0.1.dmm
 2014-03-11 02:28:58 -04:00
Ccomp5950
1e5514e27e 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/__HELPERS/mobs.dm
	code/game/objects/items/weapons/implants/implanter.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human_damage.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/silicon.dm
	code/modules/virus2/helpers.dm
	code/setup.dm
	icons/mob/hud.dmi
 2014-03-10 08:07:29 -04:00
ZomgPonies
c751ee454c Small fixes 2014-03-06 22:45:38 -05:00
ZomgPonies
8ee94ad622 alien weeds also 2014-03-06 22:23:19 -05:00
ZomgPonies
7ad775b0a2 Statue fixes 2014-03-06 19:59:07 -05:00
ZomgPonies
d15a9c1b99 Museum first iteration 2014-03-06 16:33:41 -05:00
Jeremy Liberman
99a588631a Wearing masks or straight jackets blocks chewing on your wrists 2014-03-05 22:27:40 -05:00
Jeremy Liberman
55ba32d02d Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free. 
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
 2014-03-05 22:20:44 -05:00
d3athrow
72f985f3ea Missed a reference for radio devices 2014-03-05 20:37:40 -05:00
ZomgPonies
16ea3bde04 Compile fixes 2014-03-05 20:37:02 -05:00
d3athrow
796aaa5c61 fix comments 2014-03-05 20:29:40 -05:00
d3athrow
0f0984fa57 hurf 2014-03-05 20:29:10 -05:00
d3athrow
dc50b47971 More Destroy stuff 2014-03-05 20:28:38 -05:00
d3athrow
4f168d8caf qdel and Destroy() improvements, now done through objects/items/devices 2014-03-05 20:28:17 -05:00
d3athrow
19d339c45d Furthur optimizing qdel and Destroy for obj/effect 
Conflicts:
	code/game/objects/effects/decals/Cleanable/humans.dm
 2014-03-05 20:26:40 -05:00
Ccomp5950
cd201dc3a5 NanoUI Optimizations. 
We won't regenerate the list for Manifests every tick while viewing the manifest, instead we have a global variable for it PDA_Manifest that we Cut() if there is a change to the manifest then when the next player goes to view the manifest on their PDA it will recreate the list that one time.

Some sections of the PDA will no longer auto-refresh every tick because...well that's dumb.

Modes that will no longer autoupdate at all:  Viewing medical/sec records, viewing notes (will update when you change them of course), and the station alert menu.
Modes that will only autoupdate every 5 ticks:  APC list (Because it's a huge fuck off list), the manifest, mulebots and secbots screens, supply requests/orders, and janitor supply locator)

Some other things that I just can't remember right now.

Conflicts:
	code/defines/obj.dm
 2014-03-04 00:37:44 -05:00
ZomgPonies
ab707a9c3c Custom guitar item for scrat 2014-03-03 23:02:12 -05:00
alex-gh
c0d4c2c8f7 re-added death alarm implanters 2014-03-02 09:17:49 +01:00
ZomgPonies
207959cc7d crash fix 2014-02-28 21:31:59 -05:00
Ccomp5950
09bfeb737b Runtime fix: I have no UI, and I must close it. 
runtime error: Cannot execute null.close().
proc name: Topic (/obj/item/device/pda/Topic)
  source file: PDA.dm,485
  usr: Garry Myers (/mob/living/carbon/human)
  src: PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering)
  call stack:
PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering): Topic("src=\[0x2003e95];choice=Messag...", /list (/list))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
 2014-02-28 21:03:05 -05:00
Rob Nelson
2e9c7aeefc Vastly improve display case. 2014-02-28 19:09:56 -05:00
ZomgPonies
7a87ee111f Compile fixes 2014-02-28 19:09:24 -05:00
Rob Nelson
c7774b3a41 Fully fixed compressed-matter implanter. Tested. (GitHub #526) 
Conflicts:
	code/game/objects/items/weapons/implants/implanter.dm
 2014-02-28 19:06:39 -05:00
Aryn
5b2f811b71 Lighting system is too buggy to continue until I know wtf is going on 
Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
 2014-02-28 17:47:50 -05:00
ZomgPonies
1358b11e46 ZAS overhaul 2014-02-22 23:10:37 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Lokiamis
544c39f7c2 salvage 
Conflicts:
	code/game/jobs/access.dm
	code/game/objects/items/weapons/cards_ids.dm
	maps/tgstation.2.1.0.0.1.dmm
 2014-02-16 10:38:52 -05:00
Incoming
917370a608 Jay Owen demands that this pull be merged. 
Crush a can for Jay Owen.

He has leukemia, please crush a can for Jay Owen.

His only wish is to see a can crushed live in our game.

Sprites by Nienhaus

Conflicts:
	code/game/objects/items/trash.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	icons/obj/janitor.dmi
 2014-02-16 05:42:55 -05:00
Rob Nelson
71c07e208a Improved creature AI and random mob spawning in caves. 
Also equipment lockers.

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
	code/modules/mining/materials.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/ores_coins.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/guns/energy/special.dm
	compare_report_tg.txt
	icons/obj/device.dmi
	icons/obj/mining.dmi
	icons/obj/vehicles.dmi
	maps/tgstation.2.1.0.0.1.dmm
	maps/vgstation1.0.0.dmm
 2014-02-16 04:40:18 -05:00
Rob Nelson
6ad3ca77f1 New stuff for mining 
Conflicts:
	code/game/mining_surprise.dm
	code/game/objects/structures/wizmobile.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/minerals.dm
	compare_report_tg.txt
	icons/obj/mining.dmi
	icons/turf/walls.dmi
 2014-02-16 03:54:39 -05:00
ZomgPonies
60abc446db Merge pull request #158 from SamCroswell/master 
/TG/ Card Port
 2014-02-15 12:39:49 -05:00
ZomgPonies
7a54bb3b24 Merge pull request #159 from alex-gh/fireex_nerf 
Nerfed firing items from fire extinguishers, they now do double the dama...
 2014-02-15 12:39:41 -05:00
alex-gh
9aaf0b8a5c fixed unfinished merge 2014-02-14 14:22:39 +01:00
alex-gh
4776dfd94f Telebaton now only stuns if it actually hits. 2014-02-14 14:13:03 +01:00
Zuhayr
85b59532fe using a welder with already damaged eyes no longer causes you to go blind 
Conflicts:
	code/game/objects/items/weapons/tools.dm
 2014-02-14 13:48:46 +01:00
alex-gh
0f57ef70ca Nerfed firing items from fire extinguishers, they now do double the damage compared to throwing them normally 2014-02-14 13:22:34 +01:00
Ccomp5950
ca75160d6a People in lobby won't see PDA messages. 2014-02-14 11:54:32 +01:00
SamCroswell
3634ff942b /TG/ Cards Ported, new card deck added 2014-02-11 23:22:30 -05:00
Ccomp5950
4ae2cd974b Ghosts can see PDA messages. (Redo: PR #4065 lost in merge) 2014-02-11 03:00:04 -05:00
SamCroswell
be3c95a9ff Changes 'n shit 2014-02-07 18:43:48 -05:00
SamCroswell
bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
Rob Nelson
00f830cc2a Remove radio debugging. 2014-02-05 22:51:03 -05:00
RKF45
c69ddf76ec Reintroducing the dough-based cooking system. 
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-02-01 19:22:22 -05:00
ZomgPonies
05149946d6 Remove borken RPD 2014-02-01 04:30:17 -05:00